Why is my merge not being "remembered?"
Posted: Sat Sep 12, 2009 7:01 pm
(This is Syncro SVN 1.5)
First off, I am not an SVN expert. I'm starting to think I know just enough to be dangerous. I recently did a merge from my trunk into my branch by selecting my working copy, then going to Tools->Merge, then selecting "reintegrate a branch". (Even though that seems the exact opposite of what I want to do, I hear that is the "proper" way?)
I followed the steps, edited conflicts, committed it, and now to make sure that it worked, so I did the exact same thing again and told it to "test merge". Sure enough, all of the same changes and conflicts are coming back over from the trunk to the branch? I thought that it would have told me something along the lines of, "no changes to merge"...Is that not right? Am I doing something wrong? Is there an easy way to view the merge metadata to make sure that it is being stored correctly?
Many thanks for any help you can offer.
First off, I am not an SVN expert. I'm starting to think I know just enough to be dangerous. I recently did a merge from my trunk into my branch by selecting my working copy, then going to Tools->Merge, then selecting "reintegrate a branch". (Even though that seems the exact opposite of what I want to do, I hear that is the "proper" way?)
I followed the steps, edited conflicts, committed it, and now to make sure that it worked, so I did the exact same thing again and told it to "test merge". Sure enough, all of the same changes and conflicts are coming back over from the trunk to the branch? I thought that it would have told me something along the lines of, "no changes to merge"...Is that not right? Am I doing something wrong? Is there an easy way to view the merge metadata to make sure that it is being stored correctly?
Many thanks for any help you can offer.