You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Is your feature request related to a problem? Please describe.
We are logging warnings/errors in the CLI. If you are only a UI user and are not paying attention to the console there are some things that may not make sense. For example, if I make a change locally in the code, then I try to pull, there is a chance of there being a conflict that is not visible in the UI. There are more instances, for instance if you try to import a spreadsheet where the control ID has blank cells, it simply won't import but does not give an error to the user in the frontend
Error pulling changes: CheckoutConflictError: Your local changes to the following files would be overwritten by checkout: cli/server/infrastructure/gitHistory.ts
at _checkout (/Users/cmwylie19/lula/node_modules/.pnpm/isomorphic-git@1.34.0/node_modules/isomorphic-git/index.cjs:6628:13)
at async _pull (/Users/cmwylie19/lula/node_modules/.pnpm/isomorphic-git@1.34.0/node_modules/isomorphic-git/index.cjs:10309:5)
at async Module.fastForward (/Users/cmwylie19/lula/node_modules/.pnpm/isomorphic-git@1.34.0/node_modules/isomorphic-git/index.cjs:10393:12)
at async GitHistoryUtil.pullChanges (file:///Users/cmwylie19/lula/dist/index.js:2935:11)
at async file:///Users/cmwylie19/lula/dist/index.js:4136:24 {
caller: 'git.fastForward',
code: 'CheckoutConflictError',
data: { filepaths: [ 'cli/server/infrastructure/gitHistory.ts' ] }
}
Activity