[git-users] Re: merge annotations in BASE file

When trying to merge /pom.xml on branch R1 to branch R2 git didn't detect the merge and tried to put the changes into /pom.xml on R2. I am guessing this is because when it went to merge /pom.xml on R1 to R2 it found a /pom.xml on R2 and did not bother to attempt any rename logic. On R1 /pom.

[git-users] Re: merge annotations in BASE file

On Wednesday, April 16, 2014 7:25:22 PM UTC+2, Michael Power wrote: > > I think this is caused by the complicated nature of the merge I am doing. > Here is the background. I start with a git project structured like the > following. For the sake of description this was release branch R1 > >> /p

[git-users] Re: merge annotations in BASE file

I worked around the problem using these steps. 1. git merge toBisque 2. git mergetool -t p4merge 3. wait for git to prompt to run p4merge 4. In another command prompt use git show ${MERGE_BASE_HASH}:${FILE_PATH} > ${FILE_PATH_LESS_EXTENSION}.BASE.${MERGE_NUM}.${FILE_EXTENSION}

[git-users] Re: merge annotations in BASE file

Could be that p4merge has been incorrectly configured on which files to use for what. Have you tried configuring and using another tool? Here's a recipe for configuring p4merge: https://gist.github.com/tony4d/3454372 Before you retry, you should remove any work tree changes and reset back to

[git-users] Re: merge annotations in BASE file

The poor merge tool (p4merge) is suggesting that I can keep the "BASE" file changes or keep the changes from the left or right versions. But those "BASE" file changes are not the BASE fi