#Error discarding changes

1 messages · Page 1 of 1 (latest)

quartz bolt
#

Getting these errors when trying to discard changes, there dont seem to be any changes at all though. How do i resolve this?

UI. Error:
"git discard changes failed. Details: Please create a new branch and resolve the conflicts on remote repository before proceeding ahead."

Console errors:

GET https://app.appsmith.com/api/v1/git/status/app/6376cb993b05ea5e85c28dac?branchName=master 500 (Internal Server Error)

code
: 
"AE-GIT-4044"
errorType
: 
"Git failed"
message
: 
"git discard changes failed. \nDetails: Please create a new branch and resolve the conflicts on remote repository before proceeding ahead."
title
: 
"GIT_ACTION_EXECUTION_ERROR"
quartz bolt
#

I get this when trying to commit:

Error while accessing the file system. Exception caught during execution of reset command. Cannot lock /appsmith-stacks/git-storage/6376cb983b05ea5e85c28da7/6376cb993b05ea5e85c28dac/appsmith-admin/.git/index. Ensure that no other process has an open file handle on the lock file /appsmith-stacks/git-storage/6376cb983b05ea5e85c28da7/6376cb993b05ea5e85c28dac/appsmith-admin/.git/index.lock, then you may delete the lock file and retry.```