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
