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

4 votes234 views1 answer
Install Pytoch Windows
Shell/Bash
14 votes280 views3 answers
How to delete files in linux terminal
Shell/Bash
4 votes223 views3 answers
Substring if statement variable shell script
Shell/Bash
31 votes216 views2 answers
Install dev dependency yarn
Shell/Bash
1 vote217 views4 answers
HOW TLONG FOR VS TO INSTALL?!?!?
Shell/Bash
132 votes234 views1 answer
Create remore git branch
Shell/Bash
-1 vote221 views1 answer
Expo install react native gesture
Shell/Bash
0 vote242 views1 answer
Unknown system user 'netdata' in statoverride file; the system user got removed before the override, which is most probably a packaging bug, to recover you can remove the override manually with dpkg-statoverride
Shell/Bash
0 vote238 views1 answer
Git get latest log output to file
Shell/Bash
0 vote234 views1 answer
How to increase the swap space in linux 7
Shell/Bash