Handling messy pull-request diffstats
Handling messy pull-request diffstats
Posted Apr 25, 2022 11:06 UTC (Mon) by k3ninho (subscriber, #50375)In reply to: Handling messy pull-request diffstats by pm215
Parent article: Handling messy pull-request diffstats
The tooling isn't matched to the 'send a patch' workflow of the mailing list -- a merge request wants patch-equivalent state that would apply cleanly like a good happy patch should. That said, it's weird this is a 'trick' given it's how I've come to use git for pull-request mediated development.
Maybe there should be a more-automated way to avoid suggesting things are in conflict for files you didn't edit -- the ones that change due to the repository changing around you -- but that doesn't give a hint as to the importance of changes when you merge a second branch to your non-trunk working set.
K3n.