@villares@ciberlandia.ptThis 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.
@mariatta@fosstodon.org@villares I'm a professional and even I don't know how to resolve got conflict from command line. I use my IDE to do it (pycharm). PyCharm Community version is free and available on MacOS, Windows, and Linux. The UI for resolving git conflict and merging is good, and for first years when I was still newbie at git, I almost never had to do git on command line and only through PyCharm.
@villares I love git, i really do, but yeah, this is certainly the least fun part of using it, manual conflict resolution is always troublesome and i assure you it's not a walk in the park for many developers.
I agree with other suggestions to try either pycharm or vscode, although i use vim (with the fugitive plugin, for git) myself, it's certainly less beginner friendly.
Git is nice because it makes this task much less common than previous similar tools, but there is only so much it can do.