Force git to treat files addedmo

Force git to treat files addedmodified on only 1 branch as merge conflicts - Stack Overflow
When merging, these 2 circumstances are resolved automatically:A new file was created on one branch aft
Force git to treat files addedmodified on only 1 branch as merge conflictsStack Overflow
admin8天前
60