Automatic merge failed; fix conflicts and then commit the result.
By Warren Hackett at Jan 09 2021
git Automatic merge failed; fix conflicts and then commit the result
By Shawna Corwin at Jul 12 2020