|
|
|
|
|
|
by jkubicek
1041 days ago
|
|
|
I don't understand this: > If you’re doing collaborative trunk based development then you’re only cherry-picking. All my work is collaborative trunk based development, and I never cherry-pick. > There’s absolutely nothing wrong with rebasing/squashing/amending/resetting heads on personal feature branches. I agree that there's nothing _wrong_ with it, just that it's unnecessary. If your branches are focused on a single feature and you're always squashing your PRs to main, the cleanliness of the branch while you're working on it is unimportant. |
|
|
I'm personally not a fan of always squashing, for large features you lose a lot of history. I like a merge commit in some cases, you can still undo everything easily and most git commands support --first-parent so you can "pretend" everything was squashed in certain cases. But when you're got blaming, you have a lot more context to go off.