diff --git a/8edf884dbde5828a30a4dccad503f28a/state b/8edf884dbde5828a30a4dccad503f28a/state new file mode 100644 index 0000000..9e3b09d --- /dev/null +++ b/8edf884dbde5828a30a4dccad503f28a/state @@ -0,0 +1 @@ +wontdo \ No newline at end of file diff --git a/a97c817024233be0e34536dfb1323070/description b/a97c817024233be0e34536dfb1323070/description index 4feea71..a20505b 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 6a4ff9e..7b853a3 100644 --- a/e089400e8a9e11fe9bf10d50b2f889d7/description +++ b/e089400e8a9e11fe9bf10d50b2f889d7/description @@ -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` diff --git a/e089400e8a9e11fe9bf10d50b2f889d7/state b/e089400e8a9e11fe9bf10d50b2f889d7/state new file mode 100644 index 0000000..505c028 --- /dev/null +++ b/e089400e8a9e11fe9bf10d50b2f889d7/state @@ -0,0 +1 @@ +inprogress \ No newline at end of file