Rebasing on local feature branches and even on shared feature branches the purpose of which is to get clean and merge to master (preferably with communication and collaboration via pull request): great! Cleaner history! Less noise!
I don't see a downside to changing the recommendations for keeping up to date to rebase rather than merge. Andrew On 12/23/13, 11:19 AM, James Wennmacher wrote: > Are there any negatives to changing the procedures 'Keeping Up To > Date' at > https://wiki.jasig.org/display/UPC/Git+Workflow+for+Committers and > https://wiki.jasig.org/display/UPC/Git+Workflow+for+Non-Committers to > switch to rebase from merge? > > |# retrieve the updates from the upstream repository| > |$ git fetch upstream -p| > |# switch to the master branch| > |$ git checkout master| > || > |# merge the incoming changes into your local branch| > |$ git merge upstream||/master| > |# now you're ready to update your fork| > |$ git push origin master > > to > | > |# retrieve the updates from the upstream repository| > |$ git fetch upstream -p| > |# switch to the master branch| > |$ git checkout master| > || > |# merge the incoming changes into your local branch| > |$ git _rebase_ upstream||/master| > |# now you're ready to update your fork| > |$ git push origin master| > > Especially on a feature branch this would reduce the number of 'Merge > branch 'master' of github.com:Jasig/uPortal' messages that would > appear in the commit stream. We don't have as many of these as I > remember (probably because I used to create a bunch of them but don't > anymore), but I thought it might be a better procedure. Thoughts? > -- > James Wennmacher - Unicon > 480.558.2420 > -- > > You are currently subscribed to [email protected] as: > [email protected] > To unsubscribe, change settings or access archives, see > http://www.ja-sig.org/wiki/display/JSG/uportal-dev -- You are currently subscribed to [email protected] as: [email protected] To unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/uportal-dev
