Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed reset on conflicted files

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-06-22 10:40:41 +02:00
parent ab8e8c7dbe
commit 1f889aca1c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/app/git/StatusManager.kt
View File

@ -216,7 +216,7 @@ class StatusManager @Inject constructor(
}
suspend fun reset(git: Git, statusEntry: StatusEntry, staged: Boolean) = withContext(Dispatchers.IO) {
if (staged) {
if (staged || statusEntry.statusType == StatusType.CONFLICTING) {
git
.reset()
.addPath(statusEntry.filePath)