ninetydegrees (90d)☕ (![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
ninetydegrees) wrote in ![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png)
dw_dev_training2012-08-30 01:24 pm
ninetydegrees) wrote in dw_dev_training2012-08-30 01:24 pm
Git: more newbie questions: the sequel
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
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
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
no subject
no subject
I had to rebase today because I messed up* and I totally see how it can useful and what you meant now. Thanks again!
* It was a case of 'if you built on other pull requests that then got merged'. :)