Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Hi all,
- After git push a commit:
- To bitbucket.org:xxxxx/xxxxxx.git
- ! [rejected] 724e49a572078fce9591de0fce510c2dda424589 -> branch-name (non-fast-forward)
- error: failed to push some refs to 'bitbucket.org:xxxxx/xxxx.git'
- hint: Updates were rejected because the tip of your current branch is behind
- hint: its remote counterpart. Integrate the remote changes (e.g.
- hint: 'git pull ...') before pushing again.
- hint: See the 'Note about fast-forwards' in 'git push --help' for details.
- then did pull with rebase as:
- git config pull.rebase false
- and remote changes merged locally then when checking commit history found a new commit as
- commit 9d55998e8d5ebaf3f6df49d5b25dd919be2f32d8 (HEAD -> branch-name)
- Merge: 724e49a a5d77fd
- Author: xx <email>
- Date: Wed Jan 4 13:47:06 2023
- Merge branch 'branch-name' of bitbucket.org:xxxx/xxxx into branch-name
- need to push commit before the merge, how to do that, any help?
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement