message no. 164195
Posted by pmatulis in #github at 2017-02-23T13:48:23Z
PrashantJ, if you're sure your merging to the correct branch then i would say "start over". try to understand what went wrong by looking at the conflicts