[Flightgear-devel] Git rebase, not merge (for simgear / flightgear commits)
A note for people committing code: Please don't *ever* merge from next to a topic / local branch, and then merge that branch back to the public next. Doing so makes the history much more confusing than it needs to be. Rebase your local topic branches onto next periodically when you wish to 'sync' up, and when you want to merge to next, do a final rebase, check everything works, and then merge. Otherwise we get this: http://files.goneabitbursar.com/fg/merges.png When it should look like this: http://files.goneabitbursar.com/fg/no-merges.png Another way to think about it - merges are part of the permanent history of the repository, rebases are not. The rest of us don't care how many times you update your local topic branches from next during a branch's lifetime - it's not that interesting for us ;) Of course, when you do finally merge your topic into next, that's a merge - because we do all care about recording that action in the history. (People who know Git better than I, feel free to point out any errors in the above!) James -- Cloud Computing - Latest Buzzword or a Glimpse of the Future? This paper surveys cloud computing today: What are the benefits? Why are businesses embracing it? What are its payoffs and pitfalls? http://www.accelacomm.com/jaw/sdnl/114/51425149/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Git rebase, not merge (for simgear / flightgear commits)
On Wed, 14 Dec 2011, James Turner wrote: Of course, when you do finally merge your topic into next, that's a merge - because we do all care about recording that action in the history. If your topic is freshly rebased it will just be a fast-forward merge, that is, your new commits are just added to the history of master. Nice and linear IMHO.. :) Cheers, Anders -- --- Anders Gidenstam WWW: http://gitorious.org/anders-hangar http://www.gidenstam.org/FlightGear/ -- Cloud Computing - Latest Buzzword or a Glimpse of the Future? This paper surveys cloud computing today: What are the benefits? Why are businesses embracing it? What are its payoffs and pitfalls? http://www.accelacomm.com/jaw/sdnl/114/51425149/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Git rebase, not merge (for simgear / flightgear commits)
On 14 Dec 2011, at 09:32, Anders Gidenstam wrote: If your topic is freshly rebased it will just be a fast-forward merge, that is, your new commits are just added to the history of master. Nice and linear IMHO.. :) Yes, sorry, I didn't express that clearly at all - thanks Anders! James -- Cloud Computing - Latest Buzzword or a Glimpse of the Future? This paper surveys cloud computing today: What are the benefits? Why are businesses embracing it? What are its payoffs and pitfalls? http://www.accelacomm.com/jaw/sdnl/114/51425149/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Git rebase, not merge (for simgear / flightgear commits)
Hi James, thanks for bringing this up (again)! Last Sunday I actualy started documenting the use of rebase when applying mere-requests: http://wiki.flightgear.org/Git#Merge_requests Would be nice if you (and others, like our Git-pro AndersG) could extend/correct it ;) In the new git rules we encourage people to use merge requests whenever possible, so we better document how to apply them nicely! Gijs -- Cloud Computing - Latest Buzzword or a Glimpse of the Future? This paper surveys cloud computing today: What are the benefits? Why are businesses embracing it? What are its payoffs and pitfalls? http://www.accelacomm.com/jaw/sdnl/114/51425149/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
