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

Copy Source

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

Copy Source

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

Copy Source

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

Copy Source

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/codeberg.org-forgejo-forgejo-16.x

renovate/postgres-18.x

renovate/postgres-15.x

produccion

signing

renovate/mariadb-10.x

ssh-optional

metrics

export-metrics

session

renovate/mariadb-12.x

shutdown

caching

gallinero

s3

gems

sutty

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

internal-registration

max-creation-limit

reviewers

maintainers

anubis

5.6.1+15.0.7-rootless

5.6.0+15.0.6-rootless

5.5.0+15.0.5-rootless

5.4.0+15.0.2-rootless

5.3.1+15.0.2-rootless

5.3.0+15.0.0-rootless

5.2.0+15.0.0-rootless

5.1.2+14.0.4-rootless

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 labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

3wordchant aadil (Aadil Ayub) abra-bot (Abra Bot) ammaratef45 amras (Sarma) Apfelwurm appletalk arjan basebuilder BornDeleuze Brooke carla cas (Cassowary) codegod100 coopcloud cyrnel decentral1se (d1) dede devydave fauno (fauno) flancian Frando iexos jade (Jade Ambrose) javielico (Javielico) jjsfunhouse jmakdah2 (Jackie Makdah) joe-irving (Joe Irving) kawaiipunk (KawaiiPunk) knoflook kolaente lambdabundesverband linnealovespie (April) marlon (marlon) mayel mirsal moosemower moritz nicksellen (Nick Sellen) notplants oxaliq (sorrel) p4u1 pau pharaohgraphy (Andrew 🐦‍🔥❤️‍🔥✴️) PhiNatalie renovate-bot (Comrade Renovate Bot) ripclap rix rscmbbng sef (sef) simon sixsmith (Sixsmith) stevensting tobias trav (Trav Fryer) val (val (he/him)) vaznasty virtualboys wolcen (Chris Thompson) wykwit xynosis yksflip

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: coop-cloud/forgejo#24