Top Answers

1. Why does git detect conflicts in identical lines? Line endings are also identical
   6 votes
2. How to approach a large merge with many conflicts that are not all best handled by the same person?
   4 votes
3. Git revert back and append changes
   3 votes
4. 3 votes
5. 2 votes