It’s not a Git error message, it’s the editor as git uses your default editor.
To solve this:
- press “i” (i for insert)
- write your merge message
- press “esc” (escape)
- write “:wq” (write & quit)
- then press enter
Related Posts:
- How do I update the password for Git?
- How can I Remove .DS_Store files from a Git repository?
- How can I display the current branch and folder path in terminal?
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- How do I undo the most recent local commits in Git?
- What is the best (and safest) way to merge a Git branch into master?
- Undo a Git merge that hasn’t been pushed yet
- Git merge hotfix branch into feature branch
- Abort a Git Merge
- How to modify existing, unpushed commit messages?
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- Git is not working after macOS Update (xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools)
- Enable OpenMP support in clang in Mac OS X (sierra & Mojave)
- Git is not working after macOS Update (xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools)
- How can I run python in terminal on a mac?
- Where to place $PATH variable assertions in zsh?
- Enable OpenMP support in clang in Mac OS X (sierra & Mojave)
- ERROR 2002 (HY000): Can’t connect to local MySQL server through socket ‘/tmp/mysql.sock’
- No “Proceed Anyway” option on NET::ERR_CERT_INVALID in Chrome on MacOS
- How to resolve merge conflicts in a Git repository
- Remove files from Git commit
- How can I merge multiple commits onto another branch as a single squashed commit?
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- Xcode is not currently available from the Software Update server
- How to view / open a calculator in mac OS X?
- How can I merge multiple commits onto another branch as a single squashed commit?
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- Xcode is not currently available from the Software Update server
- How to uninstall Python 2.7 on a Mac OS X 10.6.4?
- VirtualBox NS_ERROR_FAILURE (0x80004005) macOS
- Installing Homebrew on OS X
- Updating Python on Mac
- How do I upgrade to Python 3.6 with conda?
- You don’t have write permissions for the /Library/Ruby/Gems/2.3.0 directory
- Pushing empty commits to remote
- The following untracked working tree files would be overwritten by merge, but I don’t care
- pip or pip3 to install packages for Python 3?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- You don’t have write permissions for the /Library/Ruby/Gems/2.3.0 directory. (mac user)
- Undo git pull, how to bring repos to old state
- How to change default Python version?
- SocketException: Address already in use MONGODB
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- OS X: equivalent of Linux’s wget
- Terminal error: zsh: permission denied: ./startup.sh
- Failed to attach the USB device SEGGER J-Link [0100] to the virtual machine WINDOWS 7
- You don’t have write permissions for the /Library/Ruby/Gems/2.3.0 directory. (mac user)
- ImportError: No module named sklearn (Python)
- What’s a good hex editor/viewer for the Mac?
- Where to find Application Loader app in Mac?
- Undo git pull, how to bring repos to old state
- OS X: equivalent of Linux’s wget
- How to change default Python version?
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- Brew install docker does not include docker engine?
- What version of Python is on my Mac?
- Git: cannot do a partial commit during a merge (SourceTree)
- Is there a “theirs” version of “git merge -s ours”?
- brew install mysql on macOS
- How do you update Xcode on OSX to the latest version?
- Mongod complains that there is no /data/db folder
- How can I open the Atom editor from the command line in OS X?
- How to uninstall Docker completely from a Mac?
- mvn command not found in OSX Mavrerick
- How to easily install and uninstall docker on MacOs
- How to install wget in macOS?
- Maven Install on Mac OS X
- How to undo git reset –soft to get my changes back?
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- dyld: Library not loaded … Reason: Image not found
- How to install Java 8 on Mac
- editing PATH variable on mac
- Find (and kill) process locking port 3000 on Mac
- OS X Framework Library not loaded: ‘Image not found’
- git status (nothing to commit, working directory clean), however with changes commited
- How to update Ruby with Homebrew?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Upgrade Node.js to the latest version on Mac OS
- Install Visual Studio 2015 on mac
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- Vim Can’t Save File (E212)
- Change default title in mac terminal window
- Recursively find all files that match a certain pattern
- Installing cgdb on a mac os x
- Is there a “theirs” version of “git merge -s ours”?
- How can I install a previous version of Python 3 in macOS using homebrew?
- “code .” Not working in Command Line for Visual Studio Code on OSX/Mac
- mvn command not found in OSX Mavrerick
- What is the “Illegal Instruction: 4” error and why does “-mmacosx-version-min=10.x” fix it?
- Why does ‘git commit’ not save my changes?
- How can I remove a commit on GitHub?
- Shared folder between MacOSX and Windows on Virtual Box
- Get changes from master into branch in Git
- VirtualBox: mount.vboxsf: mounting failed with the error: No such device
- Installing GCC on macOS Catalina
- How to interactively (visually) resolve conflicts in SourceTree / git
- Open an .html file with default browser using Bash on Mac
- gdb fails with “Unable to find Mach task port for process-id” error
- OS X 10.9.2: checking whether the C compiler works… no