Showing results for 
Search instead for 
Did you mean: 
Copilot Lvl 2
Message 11 of 11

Re: Merge conflicts on GitHub, not locally?

I had the same problem and learned from experience that I should merge from master to my dev branch on my machine so that I can resolve the conflicts on my machine rather than letting GitHub do it (GitHub conflicts resolver looks completely unusable to me).