This must be easy to do if you are a professional software developer (which I'm not, I'm an "end user programmer" and educator), here goes the problem:

I have some code, let's call it "origin" (you can correct my names in the replies if you really have to), and I have a modified version of it, let's call it "my fork".

when "origin" gets updated I'd like to apply to "my fork" the modifications that don't affect my own previous modifications, and be shown the ones that conflict.

This is standard git merge conflict resolution, isn't it?

Is there a way of doing it outside the dreadful git context/interface?

<<<<<<< HEAD
B
=======
Z
>>>>>>> branch-a

👆​ git is already awful for us end user programmers, but this is plain hell.

#gitIsHell #versioncontrol #enduserprogramming