message no. 141513
Posted by visualshock in #github at 2016-07-04T13:33:41Z
I have two branches (master and server) and I want to merge them so everything is up to date in master. Do I need to checkout server and then merge it to master, or opposite?