update 'description' in issue e089400e8a9e11fe9bf10d50b2f889d7
This commit is contained in:
parent
5f7bb06aa8
commit
87e591e98c
1 changed files with 3 additions and 2 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
keep local `entomologist-data` branch in sync with remote
|
add `ent sync` to keep local `entomologist-data` branch in sync with remote
|
||||||
|
|
||||||
My git workflow does not use `git pull`, instead i:
|
My git workflow does not use `git pull`, instead i:
|
||||||
1. `git fetch`
|
1. `git fetch`
|
||||||
|
|
@ -8,8 +8,9 @@ When i run `git fetch` to fetch new issues, my local
|
||||||
`entomologist-data` branch does not get automatically synchronized with
|
`entomologist-data` branch does not get automatically synchronized with
|
||||||
`origin/entomologist-data`.
|
`origin/entomologist-data`.
|
||||||
|
|
||||||
The clumsy workaround is:
|
My current clumsy manual workaround is:
|
||||||
1. `git fetch`
|
1. `git fetch`
|
||||||
2. `git checkout entomologist-data`
|
2. `git checkout entomologist-data`
|
||||||
3. `git merge origin/entomologist-data`
|
3. `git merge origin/entomologist-data`
|
||||||
4. `git checkout ${BRANCH}`
|
4. `git checkout ${BRANCH}`
|
||||||
|
5. `git push origin entomologist-data`
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue