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 votes178 views1 answer
Wsl default user
Shell/Bash
6 votes194 views6 answers
Laravel install
Shell/Bash
0 vote212 views1 answer
Copy file from remote node to local
Shell/Bash
0 vote182 views1 answer
Key shortcut to get to the desktop on ubuntu
Shell/Bash
0 vote175 views1 answer
Terminal not opening ubuntu
Shell/Bash
0 vote191 views1 answer
Git remove current pull
Shell/Bash
0 vote181 views3 answers
Wget username and password
Shell/Bash
1 vote186 views1 answer
Pip freeze for only project requires
Shell/Bash
4 votes184 views3 answers
Echo date in bash
Shell/Bash
0 vote183 views1 answer
Unset a Variable; Remove Variable; Delete Variable
Shell/Bash