Question - Explain the different points when a merge can enter a conflicted stage.
Answer -
There are two stages when a merge can enter a conflicted stage.
1. Starting the merge process
If there are changes in the working directory of the stage area in the current project, the merge will fail to start. In this case, conflicts happen due to pending changes that need to be stabilized using different Git commands.
2. During the merge process
The failure during the merge process indicates that there’s a conflict between the local branch and the branch being merged. In this case, Git resolves as much as possible, but some things have to be fixed manually in the conflicted files.