yet another git problem
rrakus at redhat.com
Thu Sep 16 15:14:52 UTC 2010
On 09/16/2010 04:21 PM, 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?
What are you trying to do? I guess `git cherry-pick' will work for you.
More information about the devel