nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

First time with SourceTree, I could not pull or push

Jonathan_alvarez015

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.

Accepted answers

Mikael Sandberg

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.

All comments

Mikael Sandberg

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.

Nwokocha wisdom

Awesome response @Mikael Sandberg

Jonathan_alvarez015

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.