改善GIT对相邻块的合并冲突的建议？

Question

与我以前的问题有关 git Merge” ?

By default, git's merge algorithm can give dangerous/unhelpful suggestions.

例如，我有时会有情况，我想将本地开发分支的一些代码更改推向主分支，但是将其他更改保留在纯本地（例如，我仍然需要的调试代码，或者未完成的更改被陷入相同的更改分支）。

Say, there is a commit sequence:

! --- devel~2 = master
program main
end program main

! --- devel~1
program main
    write *, "Some debug output"
end program main

! --- devel = HEAD
program main
    write *, "Some debug output"
    write *, "Some release mode output"
end program main

Now I use git rebase -i master and want to reverse the order of the two changes. Since it affects adjacent hunks, it will create a merge conflict:

program main
<<<<<<< HEAD
=======
program main
    write *, "Some debug output"
    write *, "Some release mode output"
>>>>>>> b6b1ecc... Add debug message
end program main

It does make sense, as the second line could very well be invalid without the first.但是，如果两个添加是独立的，则GIT提出的两个建议都是不正确的。

At this point, the best thing I can do is do look at

git log -n 1 -U b6b1ecc

which will show me what part of the change is really wanted.但是在现实世界中，通常并不明显， git提出的建议是不正确的，因此我最终将未完成的更改推向了主分支。

有什么方法可以使GIT提供更合适的建议？特别是以这样的方式，Devel分支中文件的最终状态保持不变。