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 vote100 views1 answer
React-scroll
Shell/Bash
0 vote91 views1 answer
Intall docker ubuntu command
Shell/Bash
8 votes95 views1 answer
Styled componets npm
Shell/Bash
7 votes105 views2 answers
Ubuntu open all port
Shell/Bash
0 vote100 views1 answer
How to restart x window manager in ubuntu 18.04
Shell/Bash
0 vote93 views1 answer
Linux list adb
Shell/Bash
0 vote104 views1 answer
Failed to install expo package with error: yarnpkg exited with non-zero code: 1 yarnpkg exited with non-zero code: 1
Shell/Bash
0 vote53 views2 answers
Git reset commiter credentials
Shell/Bash
0 vote98 views1 answer
Laravel santum euth
Shell/Bash
0 vote101 views2 answers
Htaccess deny all but
Shell/Bash