I guess it's time for my ~yearly question about why SVN can never seem
to do this merge properly... Summary: I have a releaseA branch off of
trunk, then a releaseA + custom stuff branch off of releaseA. I also
have a releaseB branch off of trunk. I want to merge custom stuff
into releaseB to
So, I'm doing another merge between two trees, and ran into this issue again,
which reminded me that I never did get any info about what's going on...
To summarize, my repo looks something like this:
trunk - branch1 - branch1.1
|
' branch2
I have a WC containing a checkout of branch2,
So, I'm doing another merge between two trees, and ran into this
issue again, which reminded me that I never did get any info about
what's going on...
To summarize, my repo looks something like this:
trunk - branch1 - branch1.1
|
' branch2
I have a WC containing a checkout of
On Sep 17, 2010, at 12:38 PM, Bob Archer wrote:
It is updating/writing merge info on those child nodes. There must have been
a merge that was done at a level lower than the root folder of your project
which put merge info on those files but not on the parent root folder.
What is the
On Sep 17, 2010, at 12:38 PM, Bob Archer wrote:
It is updating/writing merge info on those child nodes. There must have been
a merge that was done at a level lower than the root folder of your project
which put merge info on those files but not on the parent root folder.
A more concrete
