message no. 139814
Posted by Seveas in #github at 2016-06-20T10:00:58Z
acetakwas: 'fetch all things from upstream that I don't have, then merge their master branch into my current branch, using the recursive algorithm, prefering their changes over mine'