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 vote373 views1 answer
Umount: /mnt: target is busy.
Shell/Bash
0 vote325 views1 answer
Awk field separator multiple characters
Shell/Bash
0 vote335 views1 answer
Clone and remove existing git repository
Shell/Bash
0 vote354 views1 answer
Lstinputlisting excluse lines
Shell/Bash
0 vote366 views1 answer
Brew help service
Shell/Bash
3 votes329 views2 answers
Linux full permission to folder
Shell/Bash
0 vote339 views1 answer
Ubuntu cmd time
Shell/Bash
1 vote361 views1 answer
To set main as the default branch name do:
Shell/Bash
11 votes355 views4 answers
Install phpmyadmin ubuntu 18.04
Shell/Bash
0 vote412 views1 answer
Powercli install
Shell/Bash