Exercise 4: hands on git
. Collaborative file management (3/3)
How to deal with git
conflicts
The first person to complete this process will experience no issues. However, subsequent participants may encounter merge conflicts.
Git will mark the conflicting sections in the file. You'll see these sections surrounded by <<<<<<<
, =======
, and >>>>>>>
markers.
Carefully review the conflicting sections and decide which changes to keep. Remove the conflict markers (<<<<<<<
, =======
, >>>>>>>
) and make the necessary adjustments to the code to integrate both sets of changes correctly.
After resolving the conflict, commit your changes and push your resolution to the repository.