Please enable JavaScript.
Coggle requires JavaScript to display documents.
branching & merging - Coggle Diagram
branching & merging
branching
basics
git checkout name_branch: switch to name_branch
git branch -m branch_name branch_rename
git branch name_branch: create a branch
git branch -a: list all branches with *branch_name is the current branch which is standing
git branch -d branch_name: delete a branch
happy path/
fast forward merges
change something on repo
git checkout destination_branch: to check the change and merge changes from previous branch to master branch
git checkout -b branch_name: create and jump into that branch
git diff destination_branch just_created_branch
git branch: list all of local branches
git merge previous_branch
delete previous_branch: no longer need that branch
happy path/
disable fast forward merges
change somethings first
git commit -am "first message"
change somethings second
git commit -am "first message"
git merge branch_name --no-ff
automatic
merges??/