yet another git problem
ndbecker2 at gmail.com
Thu Sep 16 14:21:02 UTC 2010
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
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?
More information about the devel