Source Tree 1 branch ahead and 1 branch behind
I have a problem with my SourceTree repository. I don't know what I did but now I have 1 branch behind and 1 branch ahead. And if I try to pull I get error which is saying that I have uncommitted changes (but I dont have any) and if I try to push I get error and is saying that I need to pull first. If I try to merge my branch I also get error which is saying: "fatal: You have not concluded your merge (MERGE_HEAD exists).Please, commit your changes before you merge."
Here is a picture:
And here is a video: http://recordit.co/MYOgeSFTaD
Thank you for your time !
I fixed by pressing the Commit button and after I checked "Push changes immediately to origin" and effectively I commit nothing (0 files). But there was created a connection between the branch and master and now I don't have anymore errors. I don't know if is normal or not but this fixed my problem. Here is a photo so you can compare the first photo with this one:
Thanks !
- How to find which github repos are using LFS
- sync files without committing?
- How do I prettily print out a git-diff output?
- Push a rebased branch?
- Trying to Disable the CC: option in git-email
- GitHub pages only showing ReadMe file?
- Git "error: The branch 'x' is not fully merged"
- Gitignore not working
- why my cli give an error when I pushing my app?
- Applying a git post-commit hook to all current and future repositories
- git fetch doesn't update my local repository
- .gitignore and "The following untracked working tree files would be overwritten by checkout"
- How to use git config --unset-all with a regex to remove many keys?
- How do I resolve git saying "Commit your changes or stash them before you can merge"?
- How can I pull/push from multiple remote locations?
- GIT: Creating new branch with reverted changes
- How to revert a commit and create a new branch from those changes?
- Create new repo on Bitbucket from Git Bash terminal?
- Google's Trunk Based Development - Do you push code directly to release branch instead of trunk?
- git ignore vim temporary files
- How can I undo pushed commits using git?
- Get GIT trailer value and save as variable?
- Add a hash/pound symbol as the first character in a git commit message in vim
- How to fix a remote branch on Git ahead of my local repository without doing a pull
- Delete all local Git branches
- How to cancel the commit while the Source Control VSCode is waiting for the commit message?
- GIT won't pull latest changes from remote
- How do I rename a Git repository?
- Merging divergent branches without rebase
- i can't push on my git branch, everything is up-to-date, but nothing is pushed?