mirror of
https://github.com/desktop/desktop
synced 2024-09-19 08:02:22 +00:00
Tidying per PR comments
This commit is contained in:
parent
adac27d087
commit
af86130436
|
@ -277,7 +277,7 @@ export async function getCherryPickSnapshot(
|
|||
}
|
||||
|
||||
const count = commits.length - remainingShas.length
|
||||
const commitSummaryIndex = (count > 0 ? count : 1) - 1
|
||||
const commitSummaryIndex = count > 0 ? count - 1 : 0
|
||||
return {
|
||||
progress: {
|
||||
kind: 'cherryPick',
|
||||
|
@ -316,13 +316,13 @@ export async function continueCherryPick(
|
|||
// apply conflict resolutions
|
||||
for (const [path, resolution] of manualResolutions) {
|
||||
const file = files.find(f => f.path === path)
|
||||
if (file !== undefined) {
|
||||
await stageManualConflictResolution(repository, file, resolution)
|
||||
} else {
|
||||
if (file === undefined) {
|
||||
log.error(
|
||||
`[continueCherryPick] couldn't find file ${path} even though there's a manual resolution for it`
|
||||
)
|
||||
continue
|
||||
}
|
||||
await stageManualConflictResolution(repository, file, resolution)
|
||||
}
|
||||
|
||||
const otherFiles = trackedFiles.filter(f => !manualResolutions.has(f.path))
|
||||
|
|
Loading…
Reference in a new issue