Closed dhh1128 closed 2 years ago
@dhh1128 Can you take a look at the merge conflicts?
FWIW, I merged the PRs in order, up to this one. Then I tried #36 and it worked fine.
So, this is the last one of the set.
Yep, I'll fix this.
It may be easiest just to reset --hard and manually cherry pick the changed sections.
I couldn't figure out why git kept interpreting this change as having a thousand-line merge conflict. So I re-created the change from scratch to make a nice, clean, small update. This PR is now obsoleted by #37.
Signed-off-by: dhh1128 daniel.hardman@sicpa.com
Preview | Diff