Files not saving to Salesforce org



Hi, I’m having an issue where my classes aren’t saving to the org, either via auto sync or manual sync. Any ideas would be appreciated. Thanks


Try running s9 commands from terminal, to see what is causing the issue

s9 commit
s9 fetch
s9 status
s9 merge
s9 push


Thanks, before I could just Save and it got pushed to the org. Did I change a settings somewhere or do I need to do a merge command every time I want to Save? Thanks

theop:~/workspace s9 status Waiting for lock file /home/ubuntu/workspace/.c9/synchronized.git.lock... Committed changes to be uploaded: (use "s9 push" to upload) (use "s9 reset" to discard changes) M classes/PPA_TaxNoticeCaseForm_Controller.cls theop:~/workspace s9 push
Please merge remote salesforce changes before pushing
theop:~/workspace $


there may be a bug, seeing output from s9 merge will help to identify the issue, please try it.


theop:~/workspace $ s9 merge
On branch master
nothing to commit, working tree clean
error: branch ‘merging’ not found.
fatal: Unable to create ‘/home/ubuntu/workspace/.c9/synchronized.git/index-merge.lock’: File exists.

Another git process seems to be running in this repository, e.g.
an editor opened by ‘git commit’. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.
theop:~/workspace $


try running rm /home/ubuntu/workspace/.c9/synchronized.git/index-merge.lock


Seems to have fixed it, thanks.