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

3 votes218 views2 answers
Git Code Push
Shell/Bash
0 vote206 views1 answer
Error running '__rvm_make -j1'
Shell/Bash
1 vote200 views1 answer
Stackoverflow most popular question
Shell/Bash
0 vote209 views1 answer
Uninstall peazip linux
Shell/Bash
0 vote201 views1 answer
Enable the containers feature in Windows Server 2019
Shell/Bash
0 vote232 views1 answer
Close tcp port on mac
Shell/Bash
2 votes200 views1 answer
Reinit gitignore
Shell/Bash
1 vote216 views1 answer
Bash cd or make dir if not exists
Shell/Bash
0 vote222 views1 answer
Tns-platform-declarations/android/android.d.ts' not found
Shell/Bash
12 votes210 views5 answers
Where is wsl folder in windows
Shell/Bash