Hi!
"git status" gives me many "unbeobachtete Dateien":
src/sage/categories/category.c
src/sage/categories/category_with_axiom.c
src/sage/misc/inputhook.c
src/sage/misc/readline_extra_commands.c
src/sage/rings/padics/padic_base_coercion.c
src/sage/rings/padics/padic_base_generic_element.c
src/sage/rings/residue_field.c
src/sage/structure/bounded_integer_sequences.c
And I get errors in
sage -t src/sage/dev/sagedev.py
Namely:
File "src/sage/dev/sagedev.py", line 1143, in sage.dev.sagedev.SageDev.pull
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
**********************************************************************
File "src/sage/dev/sagedev.py", line 3128, in sage.dev.sagedev.SageDev.merge
Failed example:
alice.merge("#1")
Expected:
Merging the remote branch "u/bob/ticket/1" into the local branch "ticket/2".
Automatic merge failed, there are conflicting commits.
<BLANKLINE>
Auto-merging alice2
CONFLICT (add/add): Merge conflict in alice2
<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/2".
Automatic merge failed, there are conflicting commits.
<BLANKLINE>
Auto-merging alice2
CONFLICT (add/add): Merge conflict in alice2
Recorded preimage for 'alice2'
<BLANKLINE>
Please edit the affected files to resolve the conflicts. When you are
finished, your resolution will be commited.
Finished? [ok/Abort] abort
**********************************************************************
Is that a problem with my local git configuration? If so, how can I
solve 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 [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-release.
For more options, visit https://groups.google.com/d/optout.
