git merge vs git merge --no-ff
By default git merge tries to execute a "fast-forward".
- default: Simply moves commits and shifts head of master to the front.
- --no-ff: Creates a merge commit instead.
--no-ff can be desirable if you want git to maintain a history of
feature branches.git undo merge
git reset --hard HEAD~1
git reset --hard <commit_sha>merging branches in git
//Make sure you are in your branch. Develop is a a branch in this case
git checkout master
Switched to branch 'master'
git pull
To pull changes of team members to your master
git checkout develop
git merge master
Resolve Conflicts in develop
git checkout master
git merge develop
To merge your final changes along with other changes to your master
git pull
If there were any additional changes made meanwhile
git push
To push the final master to the master repository
git checkout develop
//Move to branch again to workCopyright © 2021 Codeinu
Forgot your account's password or having trouble logging into your Account? Don't worry, we'll help you to get back your account. Enter your email address and we'll send you a recovery link to reset your password. If you are experiencing problems resetting your password contact us
