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 vote261 views1 answer
Error: ‘thread’ is not a member of std
Shell/Bash
0 vote263 views1 answer
Github pages vite deploy
Shell/Bash
9 votes259 views3 answers
Git reset remote
Shell/Bash
0 vote248 views1 answer
Como instalar pandoc en ubuntu
Shell/Bash
0 vote260 views1 answer
Install glfw debian
Shell/Bash
0 vote231 views1 answer
How to install mpv linux
Shell/Bash
29 votes234 views5 answers
Uninstall snap package ubuntu
Shell/Bash
0 vote290 views1 answer
"osx" please install the libcurl development files or specify --curl-config
Shell/Bash
0 vote255 views1 answer
Laravel santum euth
Shell/Bash
0 vote263 views1 answer
ERROR: Could not install packages due to an EnvironmentError: HTTPSConnectionPool(host='files.pythonhosted.org'
Shell/Bash