0
donuts
110d

BitBucket has an option to delete the branch on merge which for most cases make sense.

But what about release branches? needs 2 merges for master and develop.

Comments
  • 3
    Unselect delete during the first merge ;-)
  • 1
    @asgs I meant more like would you even use it.

    Or how do teams usually use git and branching
  • 0
    @donuts I do delete my feature branches after merging to develop
  • 0
    @asgs manually or is it automatically on merge?

    What do you do releases though? Or if multiple people are working on a branch?
  • 0
    In theory if we tag the release merge commit in develop there's no need for a master branch?

    And if needed can just rebuild that commit or branch from it for a hotfix?
  • 1
    @donuts automatic delete. The BB option you mentioned

    For release branches, we still do only one merge to develop but not deleted. Release branches could be deleted right after, but our RM team doesn't do that for some reason. The merge to master happens from develop after a week of stability

    Hotfixes are only merged to develop. No direct merges to master except from develop via a point in time commit which is tagged appropriately
  • 0
    @asgs but wouldn't develop, after a week, have features that weren't in the release?
  • 0
    @donuts right, that's why it is the mainline (with instability)
  • 0
    @asgs I mean if you merge from develop after a week into Master then master would have features that weren't released and therefore be unstable as well?
  • 1
    @donuts we don't merge the HEAD of develop to master. As I said before, only specific commits (i.e tags) which were released are merged
Add Comment