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 vote193 views1 answer
Unknown system user 'netdata' in statoverride file; the system user got removed before the override, which is most probably a packaging bug, to recover you can remove the override manually with dpkg-statoverride
Shell/Bash
19 votes224 views5 answers
Material ui npm
Shell/Bash
2 votes236 views5 answers
Add gif github readme
Shell/Bash
1 vote240 views1 answer
How to install utorrent in ubuntu 20.04 using terminal
Shell/Bash
0 vote194 views1 answer
How to log out globally from github mac
Shell/Bash
4 votes206 views4 answers
Kill all screens linux
Shell/Bash
1 vote171 views2 answers
Git see changes to one file
Shell/Bash
1 vote310 views2 answers
Install safari in ubunut
Shell/Bash
0 vote197 views1 answer
Boot.img unpack linux
Shell/Bash
3 votes292 views1 answer
Git checkout remote branch in git
Shell/Bash