search

loco-rs / loco

🚂 🦀 The one-person framework for Rust for side-projects and startups
https://loco.rs
Apache License 2.0
5.09k stars 209 forks source link

Consider squash merging #873

Closed joshka closed 4 days ago

joshka commented 5 days ago

Description

The git history of this repo is pretty difficult to follow, which may bite you in the long term. Consider using github's squash merge to avoid this. I used to personally hate the squash merge, but having worked on a library with 10k stars and 3M+ downloads, I've very much come around to it as fairly reasonable (or perhaps the least unreasonable option).

image
yorigcs commented 4 days ago

I also recommend this way. Squash commit all PR that goes to develop branch cp pr that will be put in some release and merge commit the release in master.

jondot commented 4 days ago

Definitely! Thanks for the feedback, we'll start implementing this workflow right away ❤️