Git Reverting Merge
git revert -m 1 <merge-commit>
Mobile Star
git revert -m 1 <merge-commit>
git reset --hard HEAD~1
git reset --hard <commit_sha># Fast Forward Merge
# Start a new feature
git checkout -b new-feature main
# Edit some files
git add <file>
git commit -m "Start a feature"
# Edit some files
git add <file>
git commit -m "Finish a feature"
# Merge in the new-feature branch
git checkout main
git merge new-feature
git branch -d new-feature$ git checkout master
Switched to branch 'master'
$ git merge <your brach name>git merge branch_name_to_merge_into_current_branchgit merge [alias]/[branch]