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

1 vote301 views2 answers
Delete first two lines of file linux
Shell/Bash
0 vote309 views1 answer
PULSEUADIO to PIPEWIRE default.pa -> pipewire.conf
Shell/Bash
9 votes299 views3 answers
Change shell script to executable
Shell/Bash
4 votes290 views2 answers
Error installing pyodbc linux
Shell/Bash
0 vote294 views1 answer
Install dependencies and devDependencies at same time
Shell/Bash
0 vote286 views1 answer
Installed delphi package says unit not found
Shell/Bash
2 votes309 views2 answers
Customize dock in ubuntu
Shell/Bash
9 votes320 views5 answers
Flutter build appbundle
Shell/Bash
-3 votes297 views1 answer
$100 dollar phones
Shell/Bash
3 votes309 views4 answers
Find command in linux
Shell/Bash