I am fairly new to
git checkout --ours filename.txt
git add filename.txt
git rebase --continue
$ git push origin feature/my_feature_branch
! [rejected] feature/my_feature_branch -> feature/my_feature_branch (non-fast-forward)
error: failed to push some refs to 'ssh://firstname.lastname@example.org:7999/repo/myproject.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
It looks, that someone pushed new commits between your last
git fetch and
git push. In this case you need to repeat your steps and rebase
my_feature_branch one more time.
git fetch git rebase feature/my_feature_branch git push origin feature/my_feature_branch
git fetch I recommend to examine situation with