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?
1 Comments
baronvonj@lemmy.world · 4 pts · 2y
You can still merge the whole upstream branch manually with a local clone, and git will stop on each conflict for you to resolve them. Then when it's done you can push the merged branch to your fork.
velox_vulnus@lemmy.ml · 1 pts · 2y