message no. 171910
Posted by dmlloyd in #github at 2019-04-23T18:53:32Z
you should reset to where you were in the fist place, and stick to either merging or rebasing, not both
Posted by dmlloyd in #github at 2019-04-23T18:53:32Z