Softans Latest Questions
fatal: not a git repository (or any of the parent directories): .git
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 ...
CONFLICT (content): Merge conflict in test-output/old/Suite/methods-alphabetical.html Auto-merging test-output/old/Suite/methods.html CONFLICT (content): Merge conflict in test-output/old/Suite/methods.html Auto-merging test-output/old/Suite/reporter-output.html CONFLICT (content): Merge conflict in test-output/old/Suite/reporter-output.html Auto-merging test-output/old/Suite/testng.xml.html CONFLICT (content): Merge conflict in test-output/old/Suite/testng.xml.html Auto-merging test-output/testng-failed.xml CONFLICT (content): Merge conflict in test-output/testng-failed.xml Auto-merging test-output/testng-results.xml
I have made locally changes but whenever i push the code it says “Everything up-to-date branch ‘master’ set up to track ‘origin/master’.”