Help us understand the problem. What is going on with this article?

svnブランチの内容をtrunkにマージ

More than 3 years have passed since last update.

参考: http://cockatiel-cage.hateblo.jp/entry/2012/12/14/122449

ブランチで以下を実行し、起点となるリビジョンを確認

$ svn log --stop-on-copy

trunk に切り替え

$ svn switch svn://host/trunk

merge(試行)

$ svn merge --dry-run -r xxx:HEAD svn://host/branches/branch_a 

merge(本番)

$ svn merge -r xxx:HEAD svn://host/branches/branch_a 

コミット

$ svn commit
snaka
VB,Java,.NET,Unity(C#)とやってきて、今はRubyときどきJavaScriptでサーバサイド中心。2020年は Go言語, TypeScript やっていきたい。
Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away