| theme | transition |
|---|---|
night |
slide |
successful git branching model
git push origin master
error: failed to push some refs to '/path/to/repo.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
git fetch
git pull
git checkout existing-branch
git checkout -b new-branch
git add .
git commit
git checkout dev && git pull
git checkout new-branch
git merge dev
git push
git rebase -i HEAD~5
In the Land of Mordor where the Shadows lie,
Squash last 5 commits in the current branch...
git pull --rebase origin master
http://learngitbranching.js.org
level intro1
level intro2
level intro3
level intro4
Time for a break
How deployments and release strategy depend on git workflow?
Merging and minimizing conflicts matters...
feature branch pull requests
pull requests in gitflow do work the same way
Preparing code with rebase or merge from main branch
Creating a pull request
Review, fix, click on Merge
Prepare a pull request
Automatically generate release notes
Review the changes
Merge and deploy
- Peter