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 vote321 views2 answers
Windows terminal guid
Shell/Bash
0 vote357 views1 answer
Upstream revert merge
Shell/Bash
0 vote311 views1 answer
Linux remove list of files
Shell/Bash
0 vote329 views1 answer
Initialize SQL server from command line
Shell/Bash
0 vote335 views1 answer
Delete last commit from remote repo
Shell/Bash
0 vote328 views1 answer
Linux up command multiple level of directory
Shell/Bash
0 vote346 views1 answer
Ubuntu stacer review
Shell/Bash
0 vote323 views1 answer
How much time linux has been on?
Shell/Bash
0 vote379 views1 answer
Linux guzzlehttp/psr7
Shell/Bash
0 vote339 views1 answer
Linux chown www-data
Shell/Bash