I couldn't pull from repository once I commit, I got an error

when I use sourcetree , I could't pull code form github once I commit  , I got an error like , Is it mandatory to fetch every time before commit? some times I forgot fetch , and commit my code, then I couldn't able either push to repository or pull from repository.

git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
From https://github.com/spinscidev/SprintPOC
9af6710..4a7f738 master -> origin/master

git.JPG

1 answer

This is going to happen often if you are part of a development team.

You cannot pull if you have uncommitted changes. This is to protect you from a scenario where changes someone else made to the remote would overwrite changes that you have made but not committed.

The appropriate resolution is to commit or stash any modified files in your repository, then pull. If you have un-pushed commits, git will merge the pulled commits with your commits (you may need to resolve conflicts). If you stash any changes, you can re-apply the stash after the pull is complete (again, there may be conflicts). After you have completed the pull and made sure all your changes are committed, you should be able to push.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

648 views 0 4
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you