A git merge conflict is an event that takes place when Git is unable to automatically resolve differences in code between two commits
There are two points when a merge can enter a conflicted state.
- 1. Starting the Merge Process
- If there are changes in the working directory’s stage area for the current project, merging won’t start.
- 2. During the Merge Process
- The failure during the merge process indicates that there is a conflict between the local branch and the branch being merged.
Git rebase takes the commits from a source branch and replays them onto the target branch. This creates a new commit on the target branch for each commit on the source branch.