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 vote190 views1 answer
Windows-build-tools
Shell/Bash
1 vote187 views1 answer
Macos clear dns cache
Shell/Bash
1 vote168 views1 answer
Rxjs_1.lastvaluefrom is not a function
Shell/Bash
0 vote169 views1 answer
Conda install neptune ai
Shell/Bash
2 votes166 views1 answer
Unzip folder .gz file in linux
Shell/Bash
1 vote190 views1 answer
Android zipalign source mac
Shell/Bash
0 vote226 views1 answer
Github extension for visual studio 2019 vs git scm
Shell/Bash
0 vote169 views1 answer
Ubuntu 20.04 how to stop apache2 from starting on startup
Shell/Bash
3 votes183 views1 answer
Run sh with parameter
Shell/Bash
0 vote188 views1 answer
Uninstall scikit learn
Shell/Bash