Merge Commits

[dsbert]

Is there any recommendation for how merge commits should be formatted?

My team uses gitlab, which generates merge commits with the following default template.

Merge branch '%{source_branch}' into '%{target_branch}'

%{title}

%{issues}

See merge request %{reference}

I was considering the following.

merge: '%{source_branch}' into '%{target_branch}'

%{title}

%{issues}

Merge-request: %{reference}

[damianopetrungaro]

Hey @dsbert ! merge commit should not exist IMHO :)

I do suggest you take a look at the rebase merge, which fixes the issue of having merge commits.

[MAHDTech]

In GitLab you can also change the default to Fast-forward merge which will rebase as mentioned above to stop those commits appearing.

[damianopetrungaro]

Closing this, @dsbert let me know if you have any other doubt!