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 votes277 views2 answers
One drive linux
Shell/Bash
0 vote290 views1 answer
Unknown option: '--spec'
Shell/Bash
7 votes291 views1 answer
Error: cannot install "code": classic confinement requires snaps under /snap or
Shell/Bash
14 votes270 views6 answers
How to update vscode on ubuntu
Shell/Bash
24 votes266 views2 answers
List packages linux windows
Shell/Bash
3 votes270 views1 answer
Delete floder linux
Shell/Bash
6 votes286 views3 answers
Take screenshot linux
Shell/Bash
0 vote263 views1 answer
Regex last match
Shell/Bash
-1 vote310 views2 answers
Change file name in terminal
Shell/Bash
-1 vote256 views2 answers
Error while loading shared libraries: libnss3.so: cannot open shared object file
Shell/Bash