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 vote118 views1 answer
How to open text editor in git bash
Shell/Bash
0 vote134 views1 answer
Linux split file by lines
Shell/Bash
0 vote105 views1 answer
Adb link server in react native
Shell/Bash
0 vote106 views2 answers
Remove trash linux
Shell/Bash
0 vote105 views1 answer
Brew help service
Shell/Bash
0 vote116 views1 answer
Extending ubuntu screen to android
Shell/Bash
3 votes124 views1 answer
W: some index files failed to download kali linux
Shell/Bash
0 vote110 views1 answer
Pip install by line
Shell/Bash
0 vote117 views1 answer
How to install ctlptl
Shell/Bash
6 votes119 views6 answers
Laravel install
Shell/Bash