yet another git problem

Jesse Keating jkeating at j2solutions.net
Fri Sep 17 19:58:21 UTC 2010


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/16/2010 07:21 AM, 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?
> 

- From testing here, I think you can just do:

git add .gitignore

git commit

then your merge will complete.

- -- 
Jesse Keating RHCE      (http://jkeating.livejournal.com)
Fedora Project          (http://fedoraproject.org/wiki/JesseKeating)
GPG Public Key          (geek.j2solutions.net/jkeating.j2solutions.pub)
identi.ca               (http://identi.ca/jkeating)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAkyTyF0ACgkQ4v2HLvE71NXI5wCgl0UwZZAuWK4mazuAWTEqOQrv
lP4AmwbMIfRPpwSbFsid84436LmhSjeE
=riRs
-----END PGP SIGNATURE-----


More information about the devel mailing list