Question

Two developers on your team edit the same lines of a config file on separate branches. When the second developer opens a pull request to merge their branch into main, GitHub reports that the branch cannot be merged automatically. What is the most appropriate way to resolve this situation?

Accepted Answer

Resolve the merge conflict by reviewing the conflicting changes and choosing which edits to keep, then commit the resolution

Answer

Delete the config file from both branches so Git no longer sees any difference

Answer

Force-push the second developer's branch directly to main to overwrite the earlier changes

Answer

Create a brand-new repository and re-upload only the second developer's version of the files