Git and Release Branch

[ninetydegrees]

Could someone please explain this entry in simpler terms, preferably with detailed steps? I just don't get it because I have no release branch not stemming from develop so I'm not sure how I should go about creating it (the command given in the entry doesn't work for me obviously as branches on hack are only develop and master).

Comments

[kareila]

Check and see what "git branch -r" shows you. This is what I see on my local repository:

  origin/HEAD -> origin/develop
  origin/claimed_by
  origin/develop
  upstream/develop
  upstream/master
  upstream/release-1.11.0
  upstream/release-1.12

Origin is my fork with a bugfix branch named claimed_by, and upstream is the main Dreamwidth repo. Your remotes probably have different names, which is fine! I just want to know if you see any of the release branches.

[ninetydegrees]

This is what I get:
dreamwidth/develop
dreamwidth/master
dreamwidth/release-1.11.0
dreamwidth/release-1.12
dreamwidth/release-1.13
origin/HEAD -> origin/develop
origin/develop
origin/master

[kareila]

Okay, so the next step should be: git checkout -b release-1.13 dreamwidth/release-1.13

This should create and check out a release-1.13 branch in your local copy of the code that matches the same branch in dreamwidth.

[ninetydegrees]

*headdesk* That's what I did before but I've just realized I got the branch name wrong because I had kept the zero at the end.

Thanks a lot for your patience and your clear explanations! <3

[kareila]

Glad I could help!

[fu]

Oooh I should wiki this. Lalala.