When merging, these 2 circumstances are resolved automatically:
- A new file was created on one branch after the divergence and not created on the other
- An existing file (created before the divergence) was modified on only 1 branch
Can I configure git such that it flags these circumstances as merge conflicts.
- For scenario 1, I would be able to choose between including and removing the new file.
- And for scenario 2, I would be able to choose between the modified file and the unmodified file.
Is this possible?