如何解决“由于当前分支的尖端落后而导致更新被拒绝”？

Question

I want to push to github. I am using SourceTree.

When I push, I get an error like this:

How can I solve this problem?

The graph on SourceTree is like this:

If I pull, it displays an error too like this:

Answer 1

In your screen shot you can see 3 commits, two commits are connected, test and remove test, but then your newest commit does not have a parent, hence no related histories.

Option 1 ( origin/master has no useful code)

Judging by the commit messages, you have an empty repo before your latest commit. In this situation, I would force replace what is on remote by doing git push -f .

Please note this will delete the commits labeled test and remove test .

Option 2 ( Keep origin/master )

Use git cherry-pick those commits into your local master. Always do this oldest to newest.

git cherry-pick <commit hash>