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 vote155 views1 answer
Delete all running and stopped containers
Shell/Bash
0 vote146 views1 answer
Show addition and deletion git cli
Shell/Bash
10 votes150 views5 answers
Nvm change node version
Shell/Bash
0 vote175 views1 answer
C# tostring 2 digit hex
Shell/Bash
0 vote144 views1 answer
Installer-snap change in progress
Shell/Bash
5 votes138 views2 answers
Install the latest docker on ubuntu 20.04
Shell/Bash
159 votes212 views6 answers
Nodemon use
Shell/Bash
29 votes206 views5 answers
Uninstall snap package ubuntu
Shell/Bash
1 vote169 views1 answer
How to delete images older than x days from docker hub
Shell/Bash
0 vote191 views1 answer
Get ssm version
Shell/Bash