Hello,
When I carry out a merge with conflicts, it's not always clear when
resolving the conflicts which is the correct part of code to use. I
sometimes use git blame to guide me as to the age of the different
chunks of code and hence what to choose.
I was wondering if there might be a way to help include that sort of
information directly into the conflict.
If you had a single line conflict it would be straightforward to
display by including the date the line was last modified alongside the
conflict marker:
<<<<<<< HEAD date:yesterday
print("please")
======= date:10 years ago
print("help")
>>>>>>> main
With a more realistic change with multiple lines and context from
different commits, it's not immediately obvious to me that it's
possible to do in a way that isn't completely horrible.
I am in no way a git expert though, so I thought I'd ask and see what
you thought.
Regards,
Roger
