I just tried replacing the master branch on my server with another branch, as master was broken and I could not solve the error problem ...
The branch I replaced is the latest working version I had. I did this by running the following commands from my local machine:
git checkout lastWorkingBranch
git merge -s ours master
git check wizard
git merge lastWorkingBranch master
git press start of original
Then on the server I ran
git main source of traction
However, this gave the following result:
Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -a'. root@moon :/code/moon
I tried to commit and click again on my local computer and then run pull again on the server and now get the following message:
U costing / views.py U tools.py It’s impossible to pull out, because you have files without garbage. Please correct them in the work tree, and then use 'git add / rm' as necessary to mark permission or use 'git commit -a'. root @moon: / code / moon #
I do not understand why I get this ...? I combined and clicked all my files - how can I fix them in the work tree?
source share