Writing /var/www/html/conf/plugins.local.php failed
git:daily_workflow
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | |||
|
git:daily_workflow [2021/02/24 17:56] jiggak removed |
— (current) | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | got a new task, branch name " | ||
| - | git checkout -b work | ||
| - | edit, commit, edit, commit, edit, commit | ||
| - | |||
| - | tested and ready to push upstream | ||
| - | |||
| - | check to see if someone pushed upstream while I worked | ||
| - | git checkout master | ||
| - | git pull | ||
| - | |||
| - | Already up to date? skip ahead to merge | ||
| - | Commits pulled in? we should rebase our work | ||
| - | git checkout work | ||
| - | git rebase master'' | ||
| - | |||
| - | ready to merge and push | ||
| - | git checkout master | ||
| - | git merge work | ||
| - | git push origin master'' | ||
Page Tools
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Noncommercial-Share Alike 4.0 International
