Alireza <rezaxm@xxxxxxxxx> writes: > The proposal is that an option like `-X clean` would commit a clean > merge and leave out any conflicting hunks in the tree for a follow-up > commit to resolve conflicts. You need to clarify what "leave out" means to you. If you and a side branch started from the same place and you did one thing while the side branch did something else, you would get a conflict. What would the "clean" (by your definition) result have in that block of contents that actually has a conflict? Do you mean to say "Pick our version and ignore theirs in the blocks where the changes conflict"? If so perhaps -Xours merge strategy option that the recursive backend offers is what you are looking for?
