What is the difference when I rebase a feature branch into master vs rebase a master onto feature, and when to use them?

Asked Jun 01 '21 at 09:34

Active Oct 23 '22 at 20:22

Viewed 34 times

I wonder if someone can clarify what the following git actions do:

What happens when we checkout master and git merge feature?
What happens when we checkout master and git rebase feature?
What is the difference between the two, and in what situations would I use each of them?

edited Oct 23 '22 at 20:22

knittl

asked Jun 01 '21 at 09:34

Eddie Lam

1

See [Git workflow and rebase vs merge questions](https://stackoverflow.com/q/457927/1256452) (read the whole thing, despite how long it is) and then see what questions you have left. – torek Jun 01 '21 at 09:36
@torek roger that – Eddie Lam Jun 01 '21 at 09:39

0 Answers0