I am merging code from one release to another. It has some medium level
conflicts. I would be able to sit and resolve them if I could get the
merge tools to work correctly. When I run a mergetool like p4merge,
instead of seeing the BASE file as the contents of the file before either
changes
e changes are not the BASE file changes instead they are random
merge annotations erroneously entered into the BASE file. The merge
annotations should be and are present in the target file.
On Tuesday, April 15, 2014 11:28:39 AM UTC-7, Michael Power wrote:
>
> I am merging code from one
ith meld. Both p4merge and meld are supported by
git out of the box. I had to update the path used for meld but otherwise
the merge configuration is generally unmodified. Here is my git config:
> [user]
name = Michael Power
email = you can image what goes here
[core]
autocrlf = input
fi
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.
The script allows a person to review and apply a 3 way merge of a given
file. I find it useful for my work especially with the merge process we
chose.
We have a process where we bring lots of different types of code (java,
javascript, sql) together in a merge. A lot of parallel development
