Git 3 way merge

Start a new featuregit checkout -b new-feature master
# Edit some filesgit 
add <file>git commit -m "Start a feature"
# Edit some filesgit 
add <file>git commit -m "Finish a feature"
# Develop the master branch
git checkout master
# Edit some files
git add <file>git commit -m "Make some super-stable changes to master"
# Merge in the new-feature branch
git merge new-featuregit branch -d new-feature

Source: atlassian.com

Similar codes

0 vote343 views1 answer
Enable the containers feature in Windows Server 2019
Shell/Bash
1 vote355 views1 answer
Makepkg resolve auto dependencies
Shell/Bash
4 votes342 views1 answer
Open file manager from terminal
Shell/Bash
0 vote353 views1 answer
Github pulic keys
Shell/Bash
0 vote472 views1 answer
Login as super user
Shell/Bash
3 votes351 views1 answer
Remove apache ubuntu
Shell/Bash
3 votes341 views3 answers
Delete a pushed commit
Shell/Bash
2 votes324 views1 answer
Yii2 advanced install
Shell/Bash
4 votes345 views3 answers
Bash colors
Shell/Bash
0 vote373 views1 answer
Git log all branches
Shell/Bash