Re: merging a branch to the trunk

2006/3/21, Craig White <craigwhite@azapple.com>:
>
>
> after the merge, I've got...
>
> $ ls app/controllers/application.rb*
> app/controllers/application.rb
> app/controllers/application.rb.merge-left.r14
> app/controllers/application.rb.working
> 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
something like:

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.

--
Oliver Pajonk
PS: Sorry Craig for the double-post, I hit the "Reply" button instead of
"Reply all"...