thekoushik/safe-merge-files

Issues

• Wrongly auto-resolving or marking conflicts, looping them very badly

  #4 opened 2 years ago by c4b4d4
  1

• New file always overwrites old file

  #3 opened 2 years ago by woodcockjosh
  1