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?

    • T (they/she)@beehaw.org
      link
      fedilink
      arrow-up
      1
      ·
      4 months ago

      Just make sure things are working while doing this. Maybe accepting your changes and the incoming changes is the correct way, but you need to know what you are doing.