Overview
Suppose development and staging both change the same ending of 4.txt.
While on development:
git merge staging
Git reports that automatic merging failed. Open 4.txt, inspect the marked versions, decide the correct final line, remove the markers, and save.