diff --git a/packages/insomnia/src/sync/git/git-vcs.ts b/packages/insomnia/src/sync/git/git-vcs.ts index b797edcaa434..dcccd673af06 100644 --- a/packages/insomnia/src/sync/git/git-vcs.ts +++ b/packages/insomnia/src/sync/git/git-vcs.ts @@ -767,9 +767,9 @@ export class GitVCS { }: { gitCredentials?: GitCredentials | null; handledMergeConflicts: MergeConflict[]; - commitMessage: string; - commitParent: string[]; - }) { + commitMessage: string; + commitParent: string[]; + }) { console.log('[git] continue to merge after resolving merge conflicts', await this.getCurrentBranch()); for (const conflict of handledMergeConflicts) { assertIsPromiseFsClient(this._baseOpts.fs); diff --git a/packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx b/packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx index 4c996934a877..454330c6cd76 100644 --- a/packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/sync-merge-modal.tsx @@ -51,6 +51,7 @@ export const SyncMergeModal = forwardRef((_, ref) => { isOpen: true, labels, }); + // select the first conflict by default setSelectedConflict(conflicts?.[0] || null); window.main.trackSegmentEvent({ diff --git a/packages/insomnia/src/ui/index.tsx b/packages/insomnia/src/ui/index.tsx index 0897625239f2..b96b315313e6 100644 --- a/packages/insomnia/src/ui/index.tsx +++ b/packages/insomnia/src/ui/index.tsx @@ -1146,9 +1146,6 @@ async function renderApp() { // Store the last location in local storage router.subscribe(({ location, navigation }) => { - if (location.pathname && navigation.location?.pathname) { - console.log('navigating', location.pathname, navigation.location?.pathname); - } const match = matchPath( { path: '/organization/:organizationId',