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 vote127 views1 answer
Grep simon
Shell/Bash
7 votes151 views2 answers
Docker network not found
Shell/Bash
0 vote144 views2 answers
Grep exclude file extension
Shell/Bash
4 votes106 views3 answers
Delete file older linux find
Shell/Bash
1 vote133 views1 answer
Cmd command to install xlrd version 1.2.0
Shell/Bash
0 vote172 views1 answer
Install macos on vmware ubuntu
Shell/Bash
10 votes144 views4 answers
Git revert uncommitted changes
Shell/Bash
0 vote182 views1 answer
Vite js install
Shell/Bash
0 vote143 views1 answer
How to run .run file in linux
Shell/Bash
28 votes142 views3 answers
Linux add user
Shell/Bash