Switching to the dev branch with GIT¶

If you like you can create a separate clone of the release_3.0.0dev branch.

To do so:
1. Change to a directory one level up from where you would like to install the new clone.

2. issue the command:
bq. git clone -b release_3.0.0dev https://github.com/srhea/GoldenCheetah.git GCV3

this will create a new directory called GCV3 and clone just the release_3.0.0dev branch. Now you just need to setup the build environment (gcconfig.pri, qwtconfig.pri and possibly src.pro) and you should be good to go.

I found this easier than bouncing back and forth between branches under the main repo clone.

Branch work¶

To checkout the branch, do this...

git checkout origin/release_3.0.0dev -b <your branch name>

git checkout origin/release_3.0.0dev -b work3

This creates a branch in your local repo called release, it tracks github's repo's branch called release_3.0.0dev. Also, if you have commits on master that you want to rebase (move to) the release_3.0.0dev branch, do a "git rebase"

git rebase release_3.0.0dev

Do not do a "git merge", since that would merge the two branches... bringing all the changes on master to release_3.0.0dev (yours + everyone else's...)

Or a less complex way to do it... Use "git cherry-pick <hash>", that will move one commit at a time.

git cherry-pick <hash>

Lastly, gitk is great at cherry-picking commits.

git checkout origin/release_3.0.0dev -b work3
bq. gitk work2

and then right mouse click on the commit, and cherry pick them one at a time, in order that they were commited to the branch.