Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HeiseBridge] Check for article #1790

Merged
merged 2 commits into from
Nov 10, 2020
Merged

[HeiseBridge] Check for article #1790

merged 2 commits into from
Nov 10, 2020

Conversation

ayacoo
Copy link
Contributor

@ayacoo ayacoo commented Oct 10, 2020

Related #1611

See also: #1767

Possibly the returnServerError function now intercepts something that failed in 1611. Maybe the PR is already done with it. But security checks for variables normally do not harm ;-)

@em92
Copy link
Contributor

em92 commented Oct 31, 2020

Hi, @ayacoo ! Sorry for the long delay. In mid october I have fixed Travis CI for automatic PR checks. Could you please rebase PR and fix lint issues if they appear?

@em92
Copy link
Contributor

em92 commented Oct 31, 2020

Something is messed up with your PR. It should include only your changes. Here is how rebase is done.

$ git remote -v
origin	https://github.com/em92/rss-bridge.git (fetch)
origin	https://github.com/em92/rss-bridge.git (push)
upstream	https://github.com/RSS-Bridge/rss-bridge.git (fetch)
upstream	https://github.com/RSS-Bridge/rss-bridge.git (push)

"origin" is my personal fork. "upstream" - main repository. To rebase you had to do like this

$ git rebase upstream/master

And then force-push to your remote branch. (probably git push -f should be enough).

As for now, I suggest to checkout from upstream master branch, make changes to your bridge again and force-push commit to this branch.

@ayacoo
Copy link
Contributor Author

ayacoo commented Oct 31, 2020

Mh interesting. I think a git pull in between was the mistake, the settings themselves are correct. I try it 1-2 times ;-)

@em92 em92 merged commit cc548b1 into RSS-Bridge:master Nov 10, 2020
@em92
Copy link
Contributor

em92 commented Nov 10, 2020

gj @ayacoo

@ayacoo
Copy link
Contributor Author

ayacoo commented Nov 10, 2020

Thanks for your patience :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants