Re: merging a branch to the trunk
2006/3/21, Craig White <email@example.com>:
> after the merge, I've got...
> $ ls app/controllers/application.rb*
> app/controllers/application.rb.merge- right.r20
> and I'm certain that I want the revision 20 version. What is the proper
> way to handle this?
The way is to edit "app/controllers/application.rb" so that it contains the
version that you want (merging left and right is the obvious way, but as you
definitely want r20, just copy it and overwrite
"app/controllers/application.rb"). Then mark the conflict as "resolved" with
svn resolved app/controllers/application.rb
That will get rid of the "weird" files and just leave
"app/controllers/application.rb" behind and remove the "conflict" status.
Then you can just commit it and you're done.
PS: Sorry Craig for the double-post, I hit the "Reply" button instead of
Received on Tue Mar 21 19:13:06 2006
This is an archived mail posted to the Subversion Users