Advertisement
Guest User

Untitled

a guest
Jan 4th, 2023
43
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.94 KB | None | 0 0
  1.  
  2. Hi all,
  3.  
  4. After git push a commit:
  5.  
  6. To bitbucket.org:xxxxx/xxxxxx.git
  7. ! [rejected] 724e49a572078fce9591de0fce510c2dda424589 -> branch-name (non-fast-forward)
  8. error: failed to push some refs to 'bitbucket.org:xxxxx/xxxx.git'
  9. hint: Updates were rejected because the tip of your current branch is behind
  10. hint: its remote counterpart. Integrate the remote changes (e.g.
  11. hint: 'git pull ...') before pushing again.
  12. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  13.  
  14. then did pull with rebase as:
  15.  
  16. git config pull.rebase false
  17.  
  18. and remote changes merged locally then when checking commit history found a new commit as
  19.  
  20. commit 9d55998e8d5ebaf3f6df49d5b25dd919be2f32d8 (HEAD -> branch-name)
  21. Merge: 724e49a a5d77fd
  22. Author: xx <email>
  23. Date: Wed Jan 4 13:47:06 2023
  24. Merge branch 'branch-name' of bitbucket.org:xxxx/xxxx into branch-name
  25.  
  26. need to push commit before the merge, how to do that, any help?
  27.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement