merge: mmerge master - not something we can merge
How to resolve git's “not something we can merge” error
How to resolve git's “not something we can merge” error