diff options
| author | zeripath <art27@cantab.net> | 2022-03-29 17:42:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 18:42:34 +0200 |
| commit | 1eebbf23f0a7e12d193020ba596ec61d26c33e30 (patch) | |
| tree | 0113f80f8961caf134688e3babd8ec13ba7d941c /modules/repository/generate.go | |
| parent | 66f2210feca0b50d305a46a203c2b3d2f4d3790b (diff) | |
| download | gitea-1eebbf23f0a7e12d193020ba596ec61d26c33e30.tar.gz gitea-1eebbf23f0a7e12d193020ba596ec61d26c33e30.zip | |
When conflicts have been previously detected ensure that they can be resolved (#19247)
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>
Diffstat (limited to 'modules/repository/generate.go')
0 files changed, 0 insertions, 0 deletions