git push problem - Everything is up to date but push failed - non fast forward

Question

git

Hello
Faced the following problem
Git contains 2 branches
master and development2.2

I'm trying to make a pool in 3 ways

git pull
git pull origin master
git pull origin development2.2

Already up-to-date.

Now the task is to push to development2.2

git push origin development2.2
To [email protected]:skud.git
! [rejected] development2.2 -> development2.2 (non-fast-forward)
error: failed to push some refs to '…

How so? I probably don’t understand something, tell me in which direction to dig?

Answer 1

I hope this article will give you the answer to your questions.

Answer 2

And if something kamitit then?
Try:
git fetch
git merge origin/development2.2
git stash
git rebase origin/development2.2
git push origin development2.2

Answer 3

git push -f origin development2.2
-f == forced

Answer 4

What branch are you in right now? it feels like in master. You must be in development2.2 in order to get changes in development at the pull stage. If everything is ok and there are no conflicts, then pull and push from development2.2 will solve the problem. Otherwise, the same but with conflict resolution.

Answer 5

I tried from both branches and pool and push and with and without branches =(

Answer 6

there was the same problem yesterday, I solved the problem by deleting the remote branch, and then pushing into it (a new one was created)