Git How to Fix ? Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch issue