git — Rebase vs Merge part-5
6Today class
1.What is merge(extra)
2.How to get the merge conflicts
3.How to Resolving merge conflicts
4.what is rebase ( f m –ending point)
5.How to use rebase
What is merge
Merging takes the contents of the feature branch and integrates with master branch.then merge it add the new commit to your history’s
Rebase
When you do rebase a feature branch to master branch you can move the base of the feature branch to master ending point.
![roblox# 456 [ Undertale legacy Fight timeline 3 ] [ All Strong Character + All Ulter Character ]](https://images.videosashka.com/watch/08KOpc48-Qc)
