Question

Our company git workflow looks like this: Every team member has there own branch and pulls from and pushes to a main branch called develop.

Whenever I go git pull develop git automatically opens up a texteditor (my beloved vim that is) and asks Explain why this merge is necessary.

Why is this and how can I get rid of it?

Answer 1

You can see this in git-merge

–edit

–no-edit

Invoke editor before committing successful merge to further edit the default merge message. The –no-edit option can be used to
accept the auto-generated message (this is generally discouraged) when
merging an annotated tag, in which case git merge automatically spawns
the editor so that the result of the GPG verification of the tag can
be seen.

Older scripts may depend on the historical behaviour of not allowing
the user to edit the merge log message. They will see an editor opened
when they run git merge to merge an annotated tag. To make it easier
to adjust such scripts to the updated behaviour, the environment
variable GIT_MERGE_AUTOEDIT can be set to no at the beginning of them.

And I solove it by adding export GIT_MERGE_AUTOEDIT=no in my .bash_profile