Commits on Mar 29, 2022

1. When conflicts have been previously detected ensure that they can be … …

   …resolved
   
   There is yet another problem with conflicted files not being reset when
   the test patch resolves them.
   
   This PR adjusts the code for checkConflicts to reset the ConflictedFiles
   field immediately at the top. It also adds a reset to conflictedFiles
   for the manuallyMerged and a shortcut for the empty status in
   protectedfiles.
   
   Signed-off-by: Andrew Thornton <art27@cantab.net>

   

   zeripath committed Mar 29, 2022
   Configuration menu

   • View commit details
   • Copy full SHA for 7aad0a7
   • Browse repository at this point

   Copy the full SHA

   7aad0a7 View commit details

   Browse the repository at this point in the history

2. Merge branch 'main' into really-reset-the-conflict-status

   

   6543 authored Mar 29, 2022
   Configuration menu

   • View commit details
   • Copy full SHA for de7088b
   • Browse repository at this point

   Copy the full SHA

   de7088b View commit details

   Browse the repository at this point in the history

3. Merge branch 'main' into really-reset-the-conflict-status

   

   6543 authored Mar 29, 2022
   Configuration menu

   • View commit details
   • Copy full SHA for e878d77
   • Browse repository at this point

   Copy the full SHA

   e878d77 View commit details

   Browse the repository at this point in the history

4. Merge branch 'main' into really-reset-the-conflict-status

   

   6543 authored Mar 29, 2022
   Configuration menu

   • View commit details
   • Copy full SHA for 585ae3c
   • Browse repository at this point

   Copy the full SHA

   585ae3c View commit details

   Browse the repository at this point in the history