On 01/19/2012 02:03 PM, Christina wrote: I find it essential to control exactly which branch I push from and to. So what you want to do is git push <remote> <localbranch>:<remotebranch> Git push with no arguments...I have nevere done that so I can't say, but I suspect it pushes for each of you local tracking branches, so it depends on how you made the branch in the first place. What you want to do on DOGTAG_9_BRANCH is create a revert commit, that undoes the last commit, and then push that to the DOGTAG_9_BRANCH. There is some discussion about merges versus rebases, but I think the teams (IPA, DS and now CS) all want to go with the rebase approach. So before you push changes to DOGTAG_9_BRANCH you should do git checkout DOGTAG_9_BRANCH git fetch git rebase DOGTAG_9_BRANCH I like doing it as specific steps as I understand what each step is doing. checkout makes sure I am in the right local branch. git fetch pulls the changes down from the central repo to my local repo but makes *NO* changes to my local branch git rebase only makes the changes, and will warn if there are any errors. ONce that is done, you will be able to push using push origin DOGTAG_9_BRANCH:DOGTAG_9_BRANCH You probably shouldn't be pushing to master, unless you are working with Ade and Endi on some issue.

On 01/19/2012 04:12 PM, Nathan Kinder wrote: You've probably cleared this up, but: I think that chagnes going on in 9 are going to need formatting aligned with the Master branch before they can be pushed. Ade had suggested that the approach would involve formatting in the 9 series before pushing changes, but I am not sure if this is going to work across the board any way. I assume that fixes going into the 9 series wil lbe small enough patches that they can be had merged into master.