On Thu, Apr 19, 2012 at 8:34 PM, Joachim Durchholz <j...@durchholz.org> wrote: > Am 19.04.2012 19:13, schrieb Comer: > >> [homelap-3:~/sympy] comerduncan% git rebase -i master test1 >> error: could not apply d5da8bd... fixed indention problems with >> matrices.py >> and content problems with test_matrices.py both having to do with addition >> of dual_matrix method >> hint: after resolving the conflicts, mark the corrected paths >> hint: with 'git add<paths>' and run 'git rebase --continue' >> Could not apply d5da8bd... fixed indention problems with matrices.py and >> content problems with test_matrices.py both having to do with addition of >> dual_matrix method > > > That last message shouldn't have come twice. I'm not sure what's going on, > from a really messed-up commit history to a copy&paste mistake, everything > is possible.
Indeed, that message shouldn't have appeared twice. I'm not a Git expert, but I did mess things up seriously a couple times. My humble experience tells me that in such situations Git would react much more nervously that just repeating a message. So, I have three possible interpretations: * copy-and-paste mistake, disregardable, * Git works slightly differently on Comer's laptop, disregardable, * Git itself is severely broken, which seems unlikely, judging by the output we have been shown. Neither of these provides an explanation, but they help me rest relatively calm :-) >> I got an editor window which I saved and then exited from the editor >> (TextWrangler). > > > Sounds like you tried a git commit somewhere. No, the editor window appeared because I specified the -i option to git-rebase, which triggered the interactive mode and made Git ask for an explicit list of commits, which Comer has accepted. > git should also have listed those files that have a conflict. You can get > that list anytime by issuing git status. >From what I remember, Git doesn't show that list for me when reporting a conflict; I can only see the list of files with conflict in git status. Sergiu -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to sympy@googlegroups.com. To unsubscribe from this group, send email to sympy+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
