On 22/01/2025 17:36, Brian Inglis wrote:
[...]
"Please note some changes are displaced due to rebase conflicts."
which only appear after commit --amend/rebase --continue!
As I said before, I am now noticing the limitations of interactive
rebasing and cherry-picking, sometimes skipping patches or hunks,
especially after conflicts!
If you have any advice for avoiding those conflicts, please hit me with
your clue stick! ;^>
If a 'git rebase' reports merge conflicts, I would suggest using 'git
mergetool' to invoke your favorite 3-way graphical merge tool (I like
kdiff3, but you might have a different preference).
