3 ms·
I've been using git for little while now, and started out using rebase in the manner described here. I did some experimenting first using gitk and a few git bra
by div 16y ago
I've been using git for little while now, and started out using rebase in the manner described here. I did some experimenting first using gitk and a few git branches to grok what rebase actually did, and then figured I pretty much always wanted to rebase, unless working on a branch that was 'public' (which other people will pull from).
So my strategy has been, rebase for all local branches, merge for all public branches.
That being said, I'm still quite new to git, so if anyone can explain why that strategy is flawed, I'm happy to listen.
- weavejester 16y agoI sometimes it's useful to use merge to "group" a large set of changes that all relate to one feature. That said, if I'm working on a branch for any significant period of time, I tend to push it to the remote repository anyway. It keeps it safe and shows people what you're working on.