merge: mmerge master - not something we can merge
How to resolve git's “not something we can merge” error
548k questions
547k answers
4 comments
86.3k users