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 vote95 views1 answer
Install msno in jupyter notebook
Shell/Bash
0 vote115 views1 answer
Stop gnome display manager
Shell/Bash
0 vote139 views1 answer
Anydesk linux install download
Shell/Bash
18 votes137 views6 answers
How to install django on windows
Shell/Bash
122 votes123 views6 answers
Git create a new repository
Shell/Bash
0 vote124 views1 answer
PHP Fatal error: Uncaught Error: Call to undefined function Moontoast\Math\bcadd() in /var/www/html/sms-reporting-portal/vendor/moontoast/math/src/Moontoast/Math/BigNumber.php:506
Shell/Bash
0 vote124 views2 answers
Read-json-data-response-using-php
Shell/Bash
2 votes123 views1 answer
How to create a desktop shortcut for windows store programs
Shell/Bash
0 vote125 views1 answer
Github how to access instagram private followers
Shell/Bash
0 vote121 views2 answers
Linux search string in source recursively
Shell/Bash