Hi Sergiu, 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. [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. Comer On Thursday, April 19, 2012 9:36:05 AM UTC-4, scolobb wrote: > > On Thu, Apr 19, 2012 at 4:25 PM, Matthew Rocklin <mrock...@gmail.com> > wrote: > > It looks like Comer's master branch doesn't match sympy's master branch > > (I.e. I think he has added some commits to his master.) What is the best > > way for him to correct this? > > From what I can see https://github.com/comer/sympy/commits/master , > Comer's master is behind SymPy's master, but it doesn't diverge. In > this case one of the proper ways to go would be to update the master > branch and then rebase test1 on top of the new master: > > # Update master > git checkout master > git pull <SymPy remote name> master > > # Rebase test1 > git rebase -i master test1 > > # Update both branches on GitHub > git push <your own remote name> master test1 > > It should be possible to find out the exact names of <SymPy remote > name> and <your own remote name> by running git remote show. > > Sergiu > > P.S. I'm providing skeleton overviews; don't hesitate to ask > questions. I hope I'll have the knowledge to answer them :-) > > -- You received this message because you are subscribed to the Google Groups "sympy" group. To view this discussion on the web visit https://groups.google.com/d/msg/sympy/-/mMrJZNf8MrUJ. 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.
