On Thu, Apr 19, 2012 at 8:13 PM, Comer <comer.dun...@gmail.com> wrote: > > I am trying to use your suggested steps. Here is what I am experiencing: > > [homelap-3:~/sympy] comerduncan% git checkout master > Switched to branch 'master' > Your branch is ahead of 'origin/master' by 10 commits. > [homelap-3:~/sympy] comerduncan% git remote show > github > origin > [homelap-3:~/sympy] comerduncan% man git-remote > [homelap-3:~/sympy] comerduncan% pwd > /Users/comerduncan/sympy > [homelap-3:~/sympy] comerduncan% git checkout master > Already on 'master' > Your branch is ahead of 'origin/master' by 10 commits. > [homelap-3:~/sympy] comerduncan% git pull github master > From github.com:comer/sympy > * branch master -> FETCH_HEAD > Already up-to-date.
As a side remark, this means that the branch master in your repository does not diverge from the master in SymPy, as opposed to what we suspected. > [homelap-3:~/sympy] comerduncan% git branch > * master > test1 > [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 > > I got an editor window which I saved and then exited from the editor > (TextWrangler). I do not know the value of <paths> so can not do the git > add <paths> step. All of this is normal. Rebasing is an operation which basically takes all your new commits in test1 and tries to put them on top of the new master. The result is stored in test1 only, the master stays the same. When git tried to put the commit "d5da8bd... fixed indention problems with matrices.py" on top of master, it encountered a merge conflict. [0] may provide you some additional information. Presently, the rebase process is in a hiatus. You cannot use the repository for anything else but for continuing your rebase now. *Should* you want to abort rebasing and return to the state of affairs as it were at the beginning, do git rebase --abort Now, to see where in which files exactly the merge conflict occurred, run git status You should then edit the corresponding files to resolve the merge conflicts. When you have resolved them, do git add <file1> <file2> ... <file n> where <file i> are the names of files you have edited to resolve the conflict. After that, to continue rebasing, do git rebase --continue Git will show you an editor in which you will be able to edit the old commit message, if you want. It will then try to go on rebasing the other commits in your branch. Shall you encounter merge conflicts again, the procedure will be exactly the same. Sergiu [0] http://schacon.github.com/git/user-manual.html#resolving-a-merge -- 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.
