GitHub Told Me I Had Merge Conflicts. Git Told Me I Didn't. They Were Both Right.
📰 Dev.to · Rafael Costa
Last month I tried to merge main into stg. Routine sync. GitHub said: "Can't automatically merge". So...
Last month I tried to merge main into stg. Routine sync. GitHub said: "Can't automatically merge". So...