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

2 votes193 views1 answer
Change brightness ubuntu 20.04
Shell/Bash
-2 votes136 views1 answer
Dockerfile run app cmd
Shell/Bash
16 votes145 views5 answers
Linux command to check running process
Shell/Bash
0 vote140 views1 answer
Module not found: Can't resolve 'notistack' in 'C:\Users\
Shell/Bash
0 vote155 views1 answer
# /bin/bash for launching ec2
Shell/Bash
0 vote159 views1 answer
Mysql_upgrade xampp
Shell/Bash
14 votes157 views1 answer
Nvm how to install specific version of node
Shell/Bash
66 votes227 views2 answers
What is --use-feature=2020-resolver
Shell/Bash
0 vote125 views1 answer
Cant change window manager ubuntu 20.04
Shell/Bash
15 votes145 views4 answers
Npm check package latest version
Shell/Bash