dumb git question: in a merge-based workflow, if you’re working on a branch, is there any reasonable way to integrate new changes from `main` back into your branch without using `git rebase`?
I have this belief that there are people who only use merge commits and not rebase but I don’t […]
social.jvns.ca
Original post on social.jvns.ca