Re: Confused about merging

2006/12/1, Méresse Christophe <christophe.meresse@nagra.com>:
> What do you want to do exactly ? I think you were doing the right thing with your first try (Merging to your branch what has been done on the trunk in revision 41).

Well... I created the foobranch to make a major change to the project.
When a 30% was done (and after testing it) I decided to port back to
the trunk the work completed so far. So I merged the files back to the
trunk using the TortoiseSVN procedure. I had no problem at all.

But I didn't commit on the trunk immediately (I think this may be the
cause of the problem) , I performed some changes on the freshly merged
source on my working copy and then I committed it as revision 41.

Now, I decided to port back to the foobar the changes on the source
performed the step before (changes occurred after the merge, before
the commit). But the situation described in my first post arose. Some
files (probabily those changed in between the merge and the commit)
conflicted.

Any ideas?

-- 
TREMALNAIK
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org