git Power Push

Rebasing is a frequent process for anybody utilizing git. We generally use rebasing to department our code from the final modifications and even simply to drop commits from a department.

Oftentimes when making an attempt to push after a rebase, you will see one thing like the next:

trace: Updates had been rejected as a result of the tip of your present department is behind
trace: its distant counterpart. Combine the distant modifications (e.g.
trace: 'git pull ...') earlier than pushing once more.
trace: See the 'Observe about fast-forwards' in 'git push --help' for particulars.

Generally builders will use the --force or -f flags throughout a push to drive pushing code modifications:

git push origin my-branch --force
# or
git push origin my-branch -f

I used to be not too long ago shocked to search out out that you would additionally prefix the department identify with + to drive a push:

git push origin +my-branch

The + syntax is attention-grabbing however does not appear intuitive so it isn’t a observe I would use, however that does not imply you should not!