Git: more newbie questions: the sequel

[ninetydegrees]

Once your request has been pulled into develop and you've updated develop what do you do with your 'old' branch (local and remote)?

Edit: http://git-scm.com/book/en/Git-Branching-Remote-Branches says this:

Suppose you’re done with a remote branch — say, you and your collaborators are finished with a feature and have merged it into your remote’s master branch (or whatever branch your stable codeline is in). You can delete a remote branch using the rather obtuse syntax git push [remotename] :[branch].

Is that what needs to be done here? If so what about the local branch and should we wait until code is pushed live?

Answer 1: local can be deleted w/ git branch -d BRANCHNAME (not merge needed yay)

Answer 2: remote can be deleted using git push origin :BRANCHNAME

Comments

[ninetydegrees]

So I don't have to merge it, right? It would cause conflicts in this particular case and I don't wanna resolve them.

[kareila]

Correct. I never merge my branches locally, I either rebase them or delete them.

[ninetydegrees]

Ok cool thanks. That's one part solved!