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 vote185 views1 answer
Linux ogg to wav
Shell/Bash
8 votes233 views1 answer
How is my linux
Shell/Bash
0 vote182 views1 answer
Install vim in wsl
Shell/Bash
0 vote215 views1 answer
Chgrp command
Shell/Bash
19 votes184 views5 answers
Linux add to path
Shell/Bash
0 vote157 views2 answers
Ubuntu 20.04 not starting gui
Shell/Bash
2 votes235 views2 answers
Npm package remove from npm website
Shell/Bash
0 vote169 views1 answer
Gulp-gzip
Shell/Bash
0 vote200 views2 answers
Reattach screen
Shell/Bash
2 votes208 views1 answer
Set sublime text as git editor
Shell/Bash