Chris Siebenmann
Current status: I know exactly what I want to do with git and it's a perfectly sensible thing, I just can't see and sort out how to do it.
This is the joyous 'git as an adventure game' experience I have not previously experienced. Really, I could have lived without it.
-
-
@thatcks It's like git WANTS to make easy shit hard. Whatcha trying to do? - View other replies
-
@kebesays So ideally I want a new branch tracking the (Github) pull request, then rebase/copy the relevant local changes to it. -
@thatcks create and checkout the tracking branch, and assuming your changes are committed on the local master, utter "git merge master". -
@kebesays Doesn't that get me all of my changes? I'd ideally like to get only some, and if some may have conflicts I'll want to rebase. -
@thatcks Oh, yes it does. If you need to apply some-but-not-all, checkout your local master, "git format-patch origin/master.." and (contd) -
@thatcks (concl) "git am <patch>" one at a time. Or you can "git cherry-pick" commits-by-hash from local-master onto your new branch.
-
-
@thatcks You are in a maze full of twisty-minded little gits, all alike.
Dan McDonald
(((Norman Wilson)))
Loading seems to be taking a while.
Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.