Jonathan Nieder wrote:
> | $ git merge v1.7.0
> | Auto-merging GIT-VERSION-GEN
> | CONFLICT (content): Merge conflict in GIT-VERSION-GEN
> | error: Could not parse conflict hunks in GIT-VERSION-GEN
> | Automatic merge failed; fix conflicts and then commit the result.
> | $
>
> I assume this means rerere is confused because the conflict markers
> are not in the expected format.
>
> Here is the beginning of the resulting GIT-VERSION-GEN. There are
> no conflict markers in the rest of the file.
>
> | #!/bin/sh
> |
> | GVF=GIT-VERSION-FILE
> | <<<<<<< HEAD
> | DEF_VER=v1.6.6.GIT
> | |||||||
> | <<<<<<< Temporary merge branch 1
> | DEF_VER=v1.6.6.GIT
> | |||||||
> | DEF_VER=v1.6.6.1
> | =======
> | DEF_VER=v1.6.6.2
> | >>>>>>> Temporary merge branch 2
> | =======
> | DEF_VER=v1.7.0
> | >>>>>>> v1.7.0
Workaround:
echo '* merge=sane' >>.git/info/attributes
cat <<-\EOF >>.git/config
[merge "sane"]
name = recursive conflict avoider
driver = " \
git merge-file --marker-size=%L \
-L ours -L common -L theirs \
%A %O %B >%A+ && \
mv %A+ %A"
recursive = union
EOF
This unfortunately forgets the original labels for the files being
merged.
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
