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

-1 vote134 views1 answer
Mongodb add on heroku
Shell/Bash
2 votes162 views1 answer
Upgrade plotly version
Shell/Bash
7 votes140 views1 answer
Taskkill in cmd
Shell/Bash
7 votes133 views4 answers
How to install react native
Shell/Bash
5 votes135 views1 answer
How to generate rsa key in linux
Shell/Bash
0 vote96 views1 answer
Distutils.sysconfig install
Shell/Bash
0 vote135 views1 answer
Kill: (31229): No such process
Shell/Bash
0 vote269 views1 answer
Allow users ssh
Shell/Bash
0 vote88 views1 answer
Screen sharung zoom linux x11
Shell/Bash
9 votes144 views6 answers
Update angular
Shell/Bash