Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,850 views 4 7
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