Just to add a datapoint. This[0] is what Linus has to say about rebasing and merging, and these[1] are the kernel development guidelines, when it comes to using

Just to add a datapoint. This[0] is what Linus has to say about rebasing and merging, and these[1] are the kernel development guidelines, when it comes to using git. Of course, not every project is the kernel and to each their own, but I find it's useful to know how git is used in the project for which it was originally made. [0] https://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html https://www.mail-archive.com/dri-devel@lists.sourceforge.net... [1] https://www.kernel.org/doc/html/latest/maintainer/rebasing-and-merging.html https://www.kernel.org/doc/html/latest/maintainer/rebasing-a...