diff --git a/8edf884dbde5828a30a4dccad503f28a/state b/8edf884dbde5828a30a4dccad503f28a/state deleted file mode 100644 index 9e3b09d..0000000 --- a/8edf884dbde5828a30a4dccad503f28a/state +++ /dev/null @@ -1 +0,0 @@ -wontdo \ No newline at end of file diff --git a/a97c817024233be0e34536dfb1323070/description b/a97c817024233be0e34536dfb1323070/description index a20505b..4feea71 100644 --- a/a97c817024233be0e34536dfb1323070/description +++ b/a97c817024233be0e34536dfb1323070/description @@ -1 +1 @@ -update `ent new` to output the issue ID \ No newline at end of file +update ent new to output the issue ID \ No newline at end of file diff --git a/e089400e8a9e11fe9bf10d50b2f889d7/description b/e089400e8a9e11fe9bf10d50b2f889d7/description index 7b853a3..6a4ff9e 100644 --- a/e089400e8a9e11fe9bf10d50b2f889d7/description +++ b/e089400e8a9e11fe9bf10d50b2f889d7/description @@ -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: 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 `origin/entomologist-data`. -My current clumsy manual workaround is: +The clumsy 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` diff --git a/e089400e8a9e11fe9bf10d50b2f889d7/state b/e089400e8a9e11fe9bf10d50b2f889d7/state deleted file mode 100644 index 505c028..0000000 --- a/e089400e8a9e11fe9bf10d50b2f889d7/state +++ /dev/null @@ -1 +0,0 @@ -inprogress \ No newline at end of file