development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidying per PR comments

Browse source
This commit is contained in:
tidy-dev 2021-03-02 07:03:07 -05:00
parent adac27d087
commit af86130436
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/lib/git/cherry-pick.ts
View file

@ -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))