Compare commits
No commits in common. "87e591e98c9f8b3196c14c1f0ac0379882b39a64" and "8ae970c92ed71789ac746b3ae43251cfdd3498bb" have entirely different histories.
87e591e98c
...
8ae970c92e
4 changed files with 3 additions and 6 deletions
|
|
@ -1 +0,0 @@
|
||||||
wontdo
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
update `ent new` to output the issue ID
|
update ent new to output the issue ID
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
add `ent sync` to keep local `entomologist-data` branch in sync with remote
|
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,9 +8,8 @@ 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`.
|
||||||
|
|
||||||
My current clumsy manual workaround is:
|
The clumsy 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`
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
inprogress
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue