Wednesday, Jul 10, 11:35PM
Jul. 10th, 2013 11:35 pmBug counts: resolved 399, assigned 8, needs-review 1
Two things:
1) I am currently doing some branch gymnastics with vgifts and wanted to record my process here.
Given one published branch "bug0215-submitted" which was just pulled into develop on Github, and another unpublished, temporary branch with additional changes waiting in the wings, here is what I did to update my original working branch with the new changes:
> git co develop
> git pull dreamwidth develop
> git co bug0215-submitted
> git merge develop
[note: here bug0215-submitted and develop are identical]
> git co (temp branch)
> git rebase bug0215-submitted
> git co bug0215-submitted
> git merge (temp branch)
[note: here bug0215-submitted and temp branch are identical]
> git branch -d (temp branch)
Now all of my new code is tacked onto my existing published branch and just needs to be pushed to my Github repository, along with the updated develop branch.
2) I cannot recommend GitX (http://rowanj.github.io/gitx/) highly enough for showing me at a glance how the state of my working repository changed with each command I executed above, giving me the confidence to proceed all the way through (gulp) deleting my unpublished branch.