Vegard Nossum <vegard.nossum@xxxxxxxxxx> writes: > This is a new document based on my 2022 blog post: > > https://blogs.oracle.com/linux/post/backporting-patches-using-git > > Although this is aimed at stable contributors and distro maintainers, > it does also contain useful tips and tricks for anybody who needs to > resolve merge conflicts. > > By adding this to the kernel as documentation we can more easily point > to it e.g. from stable emails about failed backports, as well as allow > the community to modify it over time if necessary. > > I've added this under process/ since it also has > process/applying-patches.rst. Another interesting document is > maintainer/rebasing-and-merging.rst which maybe should eventually refer > to this one, but I'm leaving that as a future cleanup. > > Thanks to Harshit Mogalapalli for helping with the original blog post > as well as this updated document and Bagas Sanjaya for providing > thoughtful feedback. > > v2: fixed heading style, link style, placeholder style, other comments So this seems generally good and useful. I have a few small comments, none of which necessarily block merging it in its current form: - I would like to see an ack/reviewed-by tag by others with experience with this task if possible. The lack of complaints is a good start, but not always indicative of a lack of disagreement...:) - Might this be better placed in Documentation/maintainer? - Colordiff looks cool, but I'd at least drop in a mention of the Emacs ediff mode, which offers (I believe) a lot of the same functionality. Thanks, jon
