Merge Commits #149

New Issue

GiteaMirror · 2026-02-17T11:49:45-06:00

GiteaMirror commented

2026-02-17 11:49:45 -06:00

Originally created by @dsbert on GitHub (May 24, 2022).

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}

Originally created by @dsbert on GitHub (May 24, 2022). 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} ```

GiteaMirror closed this issue

2026-02-17 11:49:45 -06:00

GiteaMirror commented

2026-02-17 11:49:47 -06:00

@damianopetrungaro commented on GitHub (May 24, 2022):

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.

@damianopetrungaro commented on GitHub (May 24, 2022): 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.

GiteaMirror commented

2026-02-17 11:49:48 -06:00

@MAHDTech commented on GitHub (Jun 30, 2022):

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

@MAHDTech commented on GitHub (Jun 30, 2022): In GitLab you can also change the default to Fast-forward merge which will rebase as mentioned above to stop those commits appearing. ![image](https://user-images.githubusercontent.com/16071195/176578504-2eb7cf63-9d8d-4d9c-90b3-c1bc17da0d8c.png)

GiteaMirror commented

2026-02-17 11:49:49 -06:00

@damianopetrungaro commented on GitHub (Sep 7, 2022):

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

@damianopetrungaro commented on GitHub (Sep 7, 2022): Closing this, @dsbert let me know if you have any other doubt!

GiteaMirror referenced this issue

2026-02-17 11:58:49 -06:00

[PR #149] [MERGED] feat: Add japanese translate #318

Sign in to join this conversation.