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

First time with SourceTree, I could not pull or push

First time using this program, I pulled a project and three days later, I commit my changes and push, but then I get an error that I was told that I did not pulled before committing, so I backed up the project and pulled recent changes than got an error saying there was a file that did not merged, It was .meta file so I was told that can be deleted since its a .meta file and then I get this error.

 

"git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks fetch origin

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks -c lfs.customtransfer.bitbucket-media-api.path=git-lfs-bitbucket-media-api pull origin master
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.


Completed with errors, see above."

What do I do? I don't want mess up the project for others.

1 answer

1 accepted

0 votes
Answer accepted
Mikael Sandberg Community Leader Apr 08, 2020

Hi @Jonathan_alvarez015,

Welcome to Atlassian Community.

The MERGE_HEAD exists is a special tag Git puts on the repository when you have an ongoing merge. In order to get rid of that tag you have to abort the merge. Run the following from command line:

git merge --abort 

You should now be able to do a pull to bring down any changes from the remote repository and merge those changes before you can push anything back the remote.

Like Mikael Sandberg likes this

Hi @Mikael Sandberg

Thank you for the welcome, your answer has really helped a lot. I learned my mistake that I must make sure I pulled before I push any new changes.

Like Mikael Sandberg likes this

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,270 views 4 5
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