Re: merging a branch to the trunk

On Tue, 2006-03-21 at 19:11 +0100, Oliver Pajonk wrote:
> 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.

----
OK - svn resovled... perhaps I should have just done svn copy rather
than merge - assuming that all I wanted was the 'branch' in the 'trunk'
- I did change a couple of files in the 'trunk' after I branched because
I left some broken code in the trunk - sensing what I was doing, decided
that it would be better to branch.
Thanks
Craig
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org