> 2) Suppose I have master branch and topic branch. During my work I am
> constantly doing "git rebase -i origin/master" down to my topic
> branch. When I want to merge my Topic branch back to master, should I
> do REBASE or MERGE? Why?
Both brings the other branch's changes to yours. Rebasing helps to
preserve linear history of your branch. But dark side of it is that
you can't (you better don't) rebase branches that has already been
pushed or made public. Merging on the other hand, is safe that way -
you could do it back and forth. But over time, your branches look like
a spider web.
I use git to track local contents. So I almost always use rebase.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
For more options, visit this group at