While firing up the apply-patch wizard slightly breaks the typical workflows, which use compare editors rather than modal wizard, I imagine that this approach might be more realistic implementationwise. In that case there should also be a button: "copy all non-conflicting changes from right to left, that belong to the commit-being-cherry-picked." - Admittedly quite long for a button description :) (B) Thinking even more broadly, support for different kinds of changes in the merge-tool would be awesome: distinguish changes from the commit-being-cherry-picked vs.
#Fixing merge conflicts in p4merge Patch
Maybe after applying the patch I still want to use the existing merge-tool approach to review which changes from other commits I'm ignoring. I think it would be awesome if in the conflicting state places like the staging view would offer to fire up the the patch wizard with input like above created behind the scenes. patch generated on the fly from the commit being cherry-picked, reduced to the current file.
local file with clean content as of local HEAD (A) I imagine that a much better user experience could be created by using the apply-patch wizard with this input: Maybe merge tool isn't the right tool in this situation, but I don't see a better option in the UI. What I see: comparison of file states *including all changes* up-to and including the commit being cherry-picked. What I expect: support for adopting only the *changes* from the commit being cherry-picked. No matter whether you use the pre-merged or clean local HEAD, the merge tool suggests to adopt changes that are completely unrelated to the commit being cherry-picked. Merge tool on 4.19 target on MacOS Big SurĪssume you use the merge tool to resolve the conflict. Screen recording of Stephan's "lorem ipsum" example done with the proposed commits
0 kommentar(er)
