0

Trunk svn url: http://svn.myserver.com/trunk/project1

Private branch created from above branch: http://svn.myserver.com/trunk/project1_myprivate

Now after some merging from trunk to private and private to trunk, finally I want to merge from trunk to myprivate branch but this time want to accept all changes of trunk and ignoring myprivate, what commands I need to acheive this?

coure2011
  • 40,286
  • 83
  • 216
  • 349

1 Answers1

0

You should use svn revert at first.

See more here: http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.revert.html

Andrej
  • 7,474
  • 1
  • 19
  • 21
  • I know this was two years ago, but I don't think he meant "ignoring local changes" I think he meant "ignoring changes committed to the private branch", which is a much trickier question. – ACK_stoverflow Aug 12 '15 at 00:39