How to overcome rebase in SmartGit?

Welcome!
With a little git experience, so maybe the question will seem stupid.
Working on a project in a team, use bitbucket. On your computer use Smartgit.
Constantly faced with the problem when someone made a commit on bitbucket, I need them to pull, but I have not yet started comity. In this case, the repository is the status of the rebasing. Commits are canceled, well, push nor pull is not working. What's the problem? Where am I being obtuse?
Thanks in advance
July 4th 19 at 22:55
1 answer
July 4th 19 at 22:57
Solution
all smartgit from the evil one.

suppose the master branch to the remote repository origin. you have a non-running commits on the master.
git fetch origin
git rebase origin/master
git push origin master

et voilà!

Find more questions by tags GitSmartGit