search

datalust / winston-seq

A Winston v3 transport for Seq
Apache License 2.0
13 stars 3 forks source link

Include the 'dist' directory #4

Closed rj-xy closed 2 years ago

nblumhardt commented 3 years ago

Hi! It looks like each time you're sending a PR here, there are commits above that aren't actually part of the intended change.

I think this is likely to be because you're sending PRs from dev, and your local dev branch is out of sync with the upstream dev (this repo).

Here's how I think you can get back in sync (may pay to check this first - apologies if you're a step or two ahead of me on this! :-))

git remote add upstream https://github.com/datalust/winston-seq
git fetch upstream
git checkout dev
git reset --hard upstream/dev

If this works, each time you start a new PR you can:

git checkout dev
git pull upstream dev
git checkout -b some-feature

Then work on the feature, commit it, then:

git push  --set-upstream origin some-feature

Your PR will then be from some-feature on your repo, to dev here.

No problem for this PR, though, I'll just squash-and-merge as soon as I've had a chance to get up to speed with it :-)

nblumhardt commented 2 years ago

Hi @rj-xy - thanks again for this! We've done some more work on the transport in #5 and should have covered most of the basic packaging now. I'll close this one to avoid conflicts, but if you're still keen to move forward please drop us a line anytime :-)