Marge vs Rebase
1 like67 views
Git commands merge and rebase are used to integrate changes from one branch into another. Merge creates a new commit to join the histories, while rebase rewrites commits to base the feature branch on the latest main branch without changing existing branches. Rebase results in a cleaner linear project history compared to merge which preserves the original commit history.
1 of 1
Download to read offline
More Related Content
What's hot (10)
Ad
Recently uploaded (20)
Ad
Marge vs Rebase
- 1. main branch main with new update feature branch new feature main with another new update merge command new merge commit Merge main branch main with new update feature branch new feature main with another new update rebase command Rebase main branch main with new update feature branch new feature main with another new update - Is a non-destructive operation - Existing branches are not changed in any way - Creates a new merge commit in the feature branch - Moves the entire feature branch to begin on the tip of the master branch - Re-writes the project history - We get much cleaner and linear project history Marge: takes all changes in one branch and merges them into another branch in one commit v/s Rebase: Branch move to a new starting point