What is the difference between git merge and git rebase?

What is the difference between git merge and git rebase?

Git merge combines changes from different branches into one, while git rebase moves or combines commits to a new base.

When should I use merge instead of rebase?

Use merge when you want to preserve the history of both branches. It's great for collaborative workflows.

Are there any downsides to using rebase?

Yes, rebasing can rewrite commit history, which may cause issues if others are working on the same branch.

Can you give me an example of when to use each?

Sure! Use merge for integrating feature branches in a team, and rebase for cleaning up your own commit history before merging.