message no. 137468
Posted by TheBlueWizard in #github at 2016-05-31T03:35:23Z
I was trying to mirror my fork of an upstream, so I git pulled the upstream onto my local copy and I got a merge conflict on .gitmodules. How do I properly fix that?