The merge command is used to integrate changes from another branch. The target of this integration (i.e. the branch that receives changes) is always the currently checked out HEAD branch.
git merge xxx
Delete local and remote tag:
From here
git tag -d 12345
git push origin :refs/tags/12345
git rebase -i <after-this-commit>
and replace “pick” on the second and subsequent commits with “squash” or “fixup”, as described in the manual.
In this example,
For example, if the user wishes to view 5 commits from the current HEAD in the past the command is git rebase -I HEAD~5
git checkout feature-branch -- src/js/some-file.js