It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

GIT push, Pull and Commit related issue

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

1 answer

0 votes
Mike Corsaro Atlassian Team Jul 18, 2018

Hello! You're seeing this issue because you have changes in your code that conflict with the changes someone else made. You'll have to resolve those conflicts before you can push your changes. You can find more info about how to do this here: https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,962 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you