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
-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
Any help here? I'm still stuck.
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
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
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
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
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
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
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;