Compare commits
4 commits
8ae970c92e
...
87e591e98c
| Author | SHA1 | Date | |
|---|---|---|---|
| 87e591e98c | |||
| 5f7bb06aa8 | |||
| f03595c2a6 | |||
| fb712b8d7e |
4 changed files with 6 additions and 3 deletions
1
8edf884dbde5828a30a4dccad503f28a/state
Normal file
1
8edf884dbde5828a30a4dccad503f28a/state
Normal file
|
|
@ -0,0 +1 @@
|
|||
wontdo
|
||||
|
|
@ -1 +1 @@
|
|||
update ent new to output the issue ID
|
||||
update `ent new` to output the issue ID
|
||||
|
|
@ -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:
|
||||
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
|
||||
`origin/entomologist-data`.
|
||||
|
||||
The clumsy workaround is:
|
||||
My current clumsy manual workaround is:
|
||||
1. `git fetch`
|
||||
2. `git checkout entomologist-data`
|
||||
3. `git merge origin/entomologist-data`
|
||||
4. `git checkout ${BRANCH}`
|
||||
5. `git push origin entomologist-data`
|
||||
|
|
|
|||
1
e089400e8a9e11fe9bf10d50b2f889d7/state
Normal file
1
e089400e8a9e11fe9bf10d50b2f889d7/state
Normal file
|
|
@ -0,0 +1 @@
|
|||
inprogress
|
||||
Loading…
Add table
Add a link
Reference in a new issue