On Fri, 11 Jan 2019 at 15:41, Deniz Bahadir via Boost
Am 11.01.19 um 03:40 schrieb Stefan Seefeld via Boost:
As to guidelines, there are a few useful documents online, such as https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/cont..., which I find quite helpful. Collecting such notes on our wiki might be useful.
I lately found this very good (and long), educational blog-entry [1] which explains when and how to use `git merge` and `git rebase`.
I highly recommend everyone using Git reads it and adopts it.
[1] https://medium.com/@porteneuve/getting-solid-at-git-rebase-vs-merge-4fa1a48c...
"I’ll cherry-pick every commit one by one"? "You fools, you have no idea what you are doing!" - could have the mighty Raymond Chen call [1] Please, let's not drift this discussion into the religious battle of merge vs rebase and alike. We (Boost) are already heavy-weight sinners sticking to the "GitFlow considered harmful" [2] [1] https://blogs.msdn.microsoft.com/oldnewthing/20180312-00/?p=98215 [2] https://www.endoflineblog.com/gitflow-considered-harmful Best regards, -- Mateusz Loskot, http://mateusz.loskot.net