yet another git problem

Todd Zullinger tmz at pobox.com
Thu Sep 16 14:44:30 UTC 2010


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').

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Never attribute to malice that which can be adequately explained by
stupidity.
    -- Hanlon's Razor

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 542 bytes
Desc: not available
Url : http://lists.fedoraproject.org/pipermail/devel/attachments/20100916/340c33bc/attachment-0001.bin 


More information about the devel mailing list