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?