If there is anyone like me who has been scared of ...
# random
j
If there is anyone like me who has been scared of rebase, I accidentally stumbled across this article I apparently had on my phones old browser that I never actually read until just now and it's very very good: https://developers.redhat.com/articles/2023/09/07/drop-git-pull-fetch-and-rebase# It tells you how to replace a pull/merge workflow with fetch/rebase, but it explains very nicely some of the concepts why we should do it which helps clarify (at least in my case) why we get scared of rebase (e.g.: i get scared off when rebasing and it wants to resolve conflicts for 10 times for each of my comments. Answer: that's why people tell us to have just a single commit for each PR, so don't do multiple - just amend previous commit reach time)
❤️ 4
👀 1
m
I disagree completely with how to do commit messages in that article, but the rest of the information is useful.
j
I what sense?
m
As in always rewriting a commit. It's good to be atomic and have different commits for different parts of what's contributing to the PR. I'll happily say that using
--amend
is good for the fixes, but not merging everything into a single commit. That's what commit squashing is for.
👍 2
j
Yeah I don't particularly like that either in case you gave to roll back certain parts parts - but it basically solves my issue of not wanting to resolve conflicts for every single commit (which has what freaked me out in the past)
m
This got a surprisingly negative reception at my work place. Mostly because of the way this person suggests using commit.
j
Eek
Is your work place on team rebase or team merge?
m
They're experienced so I think whatever is appropriate
j
I see
Would be curious to know what their approaches are to rebases when lots of commits
(or if they never getot that point or something like that)
m
I think they know how to navigate this and would use rebase
j
I see. My problem is I'm too lazy to resolve the same conflicts across multiple rebase steps and give up and resort to merge 😆
But maybe I'm just still too messy
m
I think the key is keeping things small and contained so commits aren't overlapping on what they change.
👍 1