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
- What is the best (and safest) way to merge a Git branch into master?
- Git merge hotfix branch into feature branch
- Abort a Git Merge
- How to modify existing, unpushed commit messages?
- 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)
- Where to place $PATH variable assertions in zsh?
- 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”?
- 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
- 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
- The following untracked working tree files would be overwritten by merge, but I don’t care
- 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)
- 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
- 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)
- Where to find Application Loader app in Mac?
- Undo git pull, how to bring repos to old state
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- Brew install docker does not include docker engine?
- Git: cannot do a partial commit during a merge (SourceTree)
- Is there a “theirs” version of “git merge -s ours”?
- Mongod complains that there is no /data/db folder
- How can I open the Atom editor from the command line in OS X?
- 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
- dyld: Library not loaded … Reason: Image not found
- How to install Java 8 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
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- Vim Can’t Save File (E212)
- 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?
- Open an .html file with default browser using Bash on Mac
- OS X 10.9.2: checking whether the C compiler works… no
- How to use vim in the terminal?
- -bash: export: `=’: not a valid identifier
- matplotlib: RuntimeError: Python is not installed as a framework
- Arduino IDE is not showing any port macOS
- psql: command not found Mac
- psql: FATAL: role “postgres” does not exist
- boto3 python 2.7 ImportError: No module named boto3 USER_BASE USER_SITE site packages doesn’t exist
- Python can’t find module NLTK
- sed command with -i option failing on Mac, but works on Linux
- How to keep a branch synchronized/updated with master?
- Resolve Git merge conflicts in favor of their changes during a pull
- Making sure /usr/local/bin is in my $PATH on mac
- Found a swap file by the name
- Git – Remove commit from history
- Run script on mac prompt “Permission denied”
- Why does cURL return error “(23) Failed writing body”?
- Finding text inside a folder using terminal
- Is there a git-merge –dry-run option?
- Command not found go — on Mac after installing Go
- cannot download, $GOPATH not set
- How to install pip for Python 3 on Mac OS X?
- What is the difference between MacVim and regular Vim?
- gdb debugging in Terminal OS X (10.8.5) with zsh
- Updating php version on mac
- Kill a python process
- Unmount the directory which is mounted by sshfs in Mac
- Failed to launch macOS app built in Xcode
- Testing web application on Mac/Safari when I don’t own a Mac
- How to completely uninstall Android Studio on Mac?
- Is there an equivalent of lsusb for OS X
- hat’s a clean way to stop mongod on Mac OS X?
- How to install latest version of openssl Mac OS X El Capitan
- Mongod: Command Not Found (OS X)
- Open Sublime Text from Terminal in macOS
- how to update npm on macOS
- Unable to access MySQL after it automatically generated a temporary password
- No module named ipykernel_launcher