message no. 157201
Posted by Efffe in #github at 2016-11-21T19:10:10Z
What's the command to merge master into staging, and use master's commits to resolve merge conflicts?
Posted by Efffe in #github at 2016-11-21T19:10:10Z