> On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth <alexan...@knauth.org> wrote: > > > On Jul 2, 2015, at 6:34 AM, Tim Brown <tim.br...@cityc.co.uk> wrote: > >> Folks, >> >> I have two pull requests related to my separation of "net/url-string" >> from "net/url". >> >> plt/racket #948 implementation of the separation >> racket/net #4 test and documentation of the above >> >> My problem is that I have been working on other things, and these are >> now not able to be merged into the master. (I've tried "get pull >> --ff-only..." as per Greg Hendershott's crib sheet) > > Did you try `git pull --ff-only` from your topic branch, or from the master > branch? > >> How do I resolve this? > > You probably need to checkout the master branch, then do git pull --ff-only > upstream master, > then checkout your topic branch, and then `git rebase -i master`, find the > conflicts, and resolve them.
I agree with this … except that I don’t think you want to use ‘-i’. Git rebasing is a skill, though. Keep in mind that your goal in fixing every conflict should be to understand the change that *you* made, and see how it applies to the new, changed code. Also, remember that you can read .git/rebase-apply/patch to see what the heck the change you originally made was. > > After you resolve them you will (I think) need to `git add` the files that > you resolved conflicts for, then > `git rebase --continue`, and then when the rebase is finished, `git push -f > origin topic-branch`. Also, I think you eventually want to get things back onto the master branch, right? After rebasing, you should be able to check out master again, then do a git merge —ff-only topic-branch at which point you should be able to push cleanly. John Clements -- You received this message because you are subscribed to the Google Groups "Racket Users" group. To unsubscribe from this group and stop receiving emails from it, send an email to racket-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
