Please enter a commit message to explain why this merge is necessary especially if it merges an updated upstream into a topic branch

Question

I am using Git  I did a pull from a remote repo and got an error message      Please enter a commit message to explain why this merge is necessary    especially if it merges an updated upstream into a topic branch      I try to type a message and press Enter but nothing happens   How do I tell Git Terminal I am done typing in my message   I am using Terminal on OS X

User · Answer

Since your local repository is few commits ahead, git tries to merge your remote to your local repo. This can be handled via merge, but in your case, perhaps you are looking for rebase, i.e. add your commit to the top. You can do this with

git rebase or git pull --rebase

Here is a good article explaining the difference between git pull & git pull --rebase.

https://www.derekgourlay.com/blog/git-when-to-merge-vs-when-to-rebase/

User · Answer

tl dr Set the editor to something nicer  like Sublime or Atom  Here nice is used in the meaning of an editor you like or find more user friendly   The underlying problem is that Git by default uses an editor that is too unintuitive to use for most people  Vim  Now  don t get me wrong  I love Vim  and while you could set some time aside  like a month  to learn Vim and try to understand why some people think Vim is the greatest editor in existence  there is a quicker way of fixing this problem  -   The fix is not to memorize cryptic commands  like in the accepted answer  but configuring Git to use an editor that you like and understand  It s really as simple as configuring either of these options   the git config setting core editor  per project  or globally  the VISUAL or EDITOR environment variable  this works for other programs as well    I ll cover the first option for a couple of popular editors  but GitHub has an excellent guide on this for many editors as well   To use Atom  Straight from its docs  enter this in a terminal  git config --global core editor  atom --wait   Git normally wait for the editor command to finish  but since Atom forks to a background process immediately  this won t work  unless you give it the --wait option   To use Sublime Text  For the same reasons as in the Atom case  you need a special flag to signal to the process that it shouldn t fork to the background   git config --global core editor  subl -n -w

User · Answer

I found the error because i was new to git you must check whether you have entered the correct syntax  i made a mistake and wrote  git commit   and got the same error  use  git commit -m  some comment   and you wont be seeing the page with

User · Answer

Just Do   CTRL   X  CTRL   C  It will ask you to save file  Press Y  then you are done

User · Answer

I had the same issue when I was using GIT bash to merge master branch in to my feature branch  I followed the following steps to overcome this   press  i   To insert a merge message  write your merge message press esc button  To go back  write   wq   write  amp  quit  then press enter

User · Answer

Instead  you could git CtrlZ and retry the commit but this time add   -m   with a message in quotes after it  then it will commit without prompting you with that page

User · Answer

In my case i got this message after merge  Decision  press esc  after this type  qa

User · Answer

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  amp  quit  then press enter

User · Answer

Actually it s not an error  It means you should enter some message to mark this merge  My OS is Ubuntu 14 04 If you use the same OS  you just need to do this as follows    Type some message CtrlCO Type the file name  such as  Merge feature01   and press Enter CtrlX to exit   Now if you go to  git and you will find the file  Merge feature01   that s the merge log actually

[macos] Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch

Examples related to macos

Examples related to git-merge

Examples related to git-commit

Examples related to git