message no. 94396
Posted by ciwolsey in #github at 2015-05-21T06:46:36Z
so ive been working on a project with a friend, we both created branches to work on our features, he completed his and merged it to master.. but now im trying to merge mine with master and its saying it cant merge automatically