Todd Zullinger wrote:
> Neal Becker wrote:
>> Updating igraph to 0.5.4. Success for devel and f14. Then for f13 I
>> get:
>>
>>> fedpkg switch-branch f13
>> Branch f13 set up to track remote branch f13/master from origin.
>>
>>> git merge master
>> CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and
>> deleted in master
>> Automatic merge failed; fix conflicts and then commit the result.
>>
>> Strange, that seems to be the same thing I did for f14. How do I fix?
>
> The merge works well for f14 because it was branched from master after
> the conversion to git. Prior release were "branched" in cvs and the
> git conversion imported those branches with different histories. So
> the first merge you do into an older branch usually needs some
> massassing. There's an open fedpkg ticket to improve this.
>
> On a few of my packages where I wanted to sync f13 from master, I used
> this:
>
> git merge -s recursive -X theirs master
>
> This tells git that when there are conflicts in the merge, resolve
> them automatically by preferring the content from the master branch
> ('theirs').
>
Let's try:
$rm -rf igraph
$fedpkg clone igraph
Cloning into igraph...
remote: Counting objects: 301, done.
remote: Compressing objects: 100% (153/153), done.
remote: Total 301 (delta 136), reused 294 (delta 133)
Receiving objects: 100% (301/301), 32.20 KiB, done.
Resolving deltas: 100% (136/136), done.
$cd igraph
$fedpkg switch-branch f13
Branch f13 set up to track remote branch f13/master from origin.
$ git merge -s recursive -X theirs master
CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and deleted
in master
Automatic merge failed; fix conflicts and then commit the result.
--
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
