I do not really agree with that last note paragraph.
For work branches, it is extremely useful to rebase them onto the current master instead of constantly merging master into them and generating tons of merge commits. And if everyone pulls with --rebase, it will not cause them any trouble. (And if not, it has the beneficial side effect of teaching people to use --rebase next time. 😜)
I do not really agree with that last note paragraph.
For work branches, it is extremely useful to rebase them onto the current master instead of constantly merging master into them and generating tons of merge commits. And if everyone pulls with
--rebase, it will not cause them any trouble. (And if not, it has the beneficial side effect of teaching people to use--rebasenext time. 😜)