The desired use-case might be:
- Launch KDiff3 via 'git mergetool' which auto-resolves most conflicts
- Resolve additional conflicts in KDiff3
- Use a programming editor (eg. VS) to resolve remaining conflicts
The title is a bit of a sinker as it's "No" (keep reading for question focus!) as per the KDiff3 manual, this does not appear to be possible.
Saving will only be allowed, when all conflicts were solved. [..] When you exit or start another diff-analysis and data wasn't saved yet, then KDiff3 will ask if you want to save, cancel or proceed without saving. [.. If] you "kill" KDiff3 then your data will be lost.
However, the questions/focus are:
- What makes this a forbidden operation in KDiff3? 'Simple' features may involve complicated solutions.
- Are there other 3-way diff tools or git command/approach that allows such a use-case as described above? It is unlikely such a split-part merge editing approach is novel.
- Are conflict markers added by Git (eg. prior to running the merge tool) or the merge tool itself? Is the a variation of this process?