Git merge strategy #24

New Issue

Open

opened 2026-01-20 08:56:02 +00:00 by p4u1 · 3 comments

p4u1 commented 2026-01-20 08:56:02 +00:00

Owner

Copy Link

I prefer git squash over git merge, because it makes the history cleaner. This allows for easier reviewing of the changes in a new version.

What do you think @fauno ?

I prefer git squash over git merge, because it makes the history cleaner. This allows for easier reviewing of the changes in a new version. What do you think @fauno ?

fauno commented 2026-01-20 12:24:25 +00:00

Owner

Copy Link

never used squash because i always had the impression it loses history, but it's true that you don't particularly come back to a very specific commit... i'm willing to try it!

never used squash because i always had the impression it loses history, but it's true that you don't particularly come back to a very specific commit... i'm willing to try it!

p4u1 commented 2026-01-20 15:03:44 +00:00

Author

Owner

Copy Link

I agree, that some history is lost, but that can always be viewed in the pull request history. If there are good reasons to do merge, we can always switch back I would say

I agree, that some history is lost, but that can always be viewed in the pull request history. If there are good reasons to do merge, we can always switch back I would say

fauno commented 2026-01-20 22:56:41 +00:00

Owner

Copy Link

agh i just pressed the merge button for the three prs :P next time with #25

agh i just pressed the merge button for the three prs :P next time with #25

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

renovate/postgres-18.x

renovate/postgres-15.x

renovate/mariadb-12.x

renovate/mariadb-10.x

gems

sutty

renovate/codeberg.org-forgejo-forgejo-14.x

internal-registration

max-creation-limit

reviewers

maintainers

anubis

5.1.1+14.0.3-rootless

5.1.0+14.0.1-rootless

5.0.3+13.0.4-rootless

5.0.2+13.0.4-rootless

5.0.1+13.0.3-rootless

5.0.0+13.0.2-rootless

4.0.2+12.0.2-rootless

4.0.1+12.0.2-rootless

4.0.0+12.0.2-rootless

3.5.2+1.24.2-rootless

3.5.1+1.24.2-rootless

3.5.0+1.24.2-rootless

3.4.0+1.24.2-rootless

3.3.1+1.23.8-rootless

3.3.0+1.23.1-rootless

3.2.0+1.23.1-rootless

3.1.1+1.23.1-rootless

3.1.0+1.23.0-rootless

3.0.3+1.22.6-rootless

3.0.2+1.22.6-rootless

3.0.1+1.22.3-rootless

3.0.0+1.22.2-rootless

2.11.0+1.22.2-rootless

2.10.1+1.22.2-rootless

2.10.0+1.22.1-rootless

2.9.1+1.22.0-rootless

2.9.0+1.22.0-rootless

2.8.0+1.21.11-rootless

2.7.0+1.21.11-rootless

2.6.2+1.21.10-rootless

2.6.1+1.21.10-rootless

2.6.0+1.21.5-rootless

2.5.2+1.21.5-rootless

2.5.1+1.21.4-rootless

2.5.0+1.21.1-rootless

2.4.0+1.21.0-rootless

2.3.3+1.20.5-rootless

2.3.1+1.20.1-rootless

2.3.2+1.20.3-rootless

2.1.2+1.19.3-rootless

1.3.1+1.17.3-rootless

2.3.0+1.20.1-rootless

2.2.0+1.19.3-rootless

2.1.0+1.18.5-rootless

2.0.1+1.18.2-rootless

2.0.0+1.18.0-rootless

1.3.0+1.17.2-rootless

1.2.1+1.16.8-rootless

1.2.0+1.16.3-rootless

1.1.3+1.15.10-rootless

1.1.2+1.15.6-rootless

1.1.1+1.15.3-rootless

1.1.0+1.15.0-rootless

1.0.0+1.14.5-rootless

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

3wordchant aadil abra-bot ammaratef45 Apfelwurm appletalk arjan basebuilder Brooke carla cas codegod100 coopcloud cyrnel decentral1se devydave fauno flancian Frando iexos jade javielico jmakdah2 joe-irving kawaiipunk knoflook kolaente lambdabundesverband linnealovespie marlon mayel mirsal moritz nicksellen notplants p4u1 pau pharaohgraphy renovate-bot ripclap rix rscmbbng sef simon sixsmith stevensting tobias trav val vaznasty virtualboys wolcen wykwit xynosis yksflip

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: coop-cloud/forgejo#24

No description provided.