Edit foo.txt from app #2
Change common foo.txt from app #1
Resolve merge conflicts in app #2 when pulling in latest common code