Hi!
With rerere enabled in git (after a suggestion of Volker), I get
Failed example:
alice.pull()
Expected:
Merging the remote branch "u/bob/ticket/1" into the local branch "ticket/1".
Automatic merge failed, there are conflicting commits.
<BLANKLINE>
Auto-merging alices_file
CONFLICT (add/add): Merge conflict in alices_file
<BLANKLINE>
Please edit the affected files to resolve the conflicts. When you are
finished,
your resolution will be commited.
Finished? [ok/Abort] abort
Got:
Merging the remote branch "u/bob/ticket/1" into the local branch "ticket/1".
Automatic merge failed, there are conflicting commits.
<BLANKLINE>
Auto-merging alices_file
CONFLICT (add/add): Merge conflict in alices_file
Recorded preimage for 'alices_file'
<BLANKLINE>
Please edit the affected files to resolve the conflicts. When you are
finished, your resolution will be commited.
Finished? [ok/Abort] abort
I think I reported that here before, but did not create a ticket. Did
someone else open a ticket for it?
Best regards,
Simon
--
You received this message because you are subscribed to the Google Groups
"sage-release" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-release+unsubscr...@googlegroups.com.
To post to this group, send email to sage-release@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-release.
For more options, visit https://groups.google.com/d/optout.
