Re: yet another git problem

2010-09-17 Thread Michel Alexandre Salim
On Thu, 16 Sep 2010 10:21:02 -0400, 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 .cvsigno

Re: yet another git problem

2010-09-17 Thread Jesse Keating
-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

Re: yet another git problem

2010-09-17 Thread Neal Becker
Any help here? I'm still stuck. -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel

Re: yet another git problem

2010-09-16 Thread Garrett Holmstrom
Roman Rakus wrote: > 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): Re

Re: yet another git problem

2010-09-16 Thread Andreas Schwab
Neal Becker writes: > Let's try: > > $rm -rf igraph Btw., you can undo a failed merge with "git reset --merge". Andreas. -- Andreas Schwab, sch...@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different." -- devel mailin

Re: yet another git problem

2010-09-16 Thread Roman Rakus
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

Re: yet another git problem

2010-09-16 Thread Neal Becker
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->.g

Re: yet another git problem

2010-09-16 Thread Todd Zullinger
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 m

yet another git problem

2010-09-16 Thread Neal Becker
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;