So, this is my situation: I’ve forked this repository which contains dotfile and script for hyprland. I changed some files and now, if I want to sync all the commits made on the original repository to my repository github says “This branch has conflicts that must be resolved”. My question is: can I merge only the commits that don’t conflict with my files? What else can I do?
Use interactive merge or rebase - whatever seems fit to you.
If they don’t know how to solve conflicts do you think that they know the difference between merge or rebase?