On Tue, Nov 16, 2021 at 12:50:29AM +0000, Thomas Adam wrote: > For the current documentation work you're sending patches for, I'm doing the > same thing, but I presume if you're squashing or editing changes together, it > makes it harder for me to know what I'm supposed to be tracking, that's all.
Actually, I didn't edit patches until half an hour ago, and I'm not sure why you got a conflict. Well, I had two more unrelated patches at the bottom of the stack, and for the style manpage I moved roughly 2000 lines around in the source file. I have just a local master with a pile of patches, multiple topics in the same branch. The branch is rebased to origin/master once in a while, and certainly before sending patches. If you get conflicts, just ask for new patches. It's not worth the effort that you try to repair anything. Things will get much simpler with the big man page restructuring done. In any case, it's a good if another person looks at patches, not just me. Ciao Dominik ^_^ ^_^ -- Dominik Vogt
