I am getting error while pulling the changes from Server/Bitbucket:
git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
git -c diff.mnemonicprefix=false -c core.quotepath=false pull origin master
From https://bitbucket.org/AST_Automation_Team/move-oracle-cloud-erp-r13
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
src/test/resources/TestArtifacts/Test Automation Common Navigation Actions.xlsx
src/test/resources/TestArtifacts/Test_Data_Files/TestData_CreateNonCatalogRequisition.xlsx
src/test/resources/TestArtifacts/Test_Data_Files/TestData_LoginLogout.xlsx
test-output/Parallel test suite/Chrome Test.html
test-output/Parallel test suite/Chrome Test.xml
test-output/emailable-report.html
test-output/index.html
test-output/junitreports/TEST-RunManager.HybridExecuteTest.xml
test-output/old/Parallel test suite/methods-alphabetical.html
test-output/old/Parallel test suite/methods.html
test-output/testng-results.xml
Please commit your changes or stash them before you merge.
Aborting
I am getting error while pushing the changes to Server/Bitbucket:
git -c diff.mnemonicprefix=false -c core.quotepath=false push -v origin master:master
Pushing to https://Ziyaur@bitbucket.org/AST_Automation_Team/move-oracle-cloud-erp-r13.git
To https://bitbucket.org/AST_Automation_Team/move-oracle-cloud-erp-r13.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://Ziyaur@bitbucket.org/AST_Automation_Team/move-oracle-cloud-erp-r13.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Regards,
Ziyaur Rahman
