Difference between revisions of "Fast-forward"

From wikieduonline
Jump to navigation Jump to search
Line 21: Line 21:
 
== Related ==
 
== Related ==
 
* <code>[[--ff-only]]</code>
 
* <code>[[--ff-only]]</code>
 +
* <code>[[git push -f]]</code>
  
 
== See also ==
 
== See also ==

Revision as of 09:07, 27 April 2023

fast-forward merge

git config pull.ff only  
Your branch is behind 'origin/main' by 20 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Errors

git push origin HEAD:you_remote_branch_name
To bitbucket.org:your_org/you_repo.git
 ! [rejected]        HEAD -> you_remote_branch_name (non-fast-forward)
error: failed to push some refs to 'bitbucket.org:your_org/your_repo.git' 
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
➜  your_repo git:(95bace6)


git push xxx your-branch
To https://github.com/your-user/your-repo.git
 ! [rejected]        your-branch -> your-branch (non-fast-forward)
error: failed to push some refs to 'https://github.com/your-user/your-repo.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Related

See also

Advertising: