Saved Bookmarks
| 1. |
What Is A ‘conflict’ In Git? |
|
Answer» A ‘conflict’ ARISES when the commit that has to be merged has some change in ONE place, and the current commit ALSO has a change at the same place. Git will not be able to predict which change should TAKE precedence. A ‘conflict’ arises when the commit that has to be merged has some change in one place, and the current commit also has a change at the same place. Git will not be able to predict which change should take precedence. |
|