Skip to content

Conversation

@andresmrm
Copy link

Maildir support was discussed here:
#21

Setting user-agent maybe good in some cases...
(Found a site that gives HTTP Error 403 if the user-agent contains the word "email"!!! I know, the site is wrong, but...)

@wking
Copy link
Owner

wking commented Dec 13, 2015

On Mon, Jun 30, 2014 at 07:04:52PM -0700, Andrés Martano wrote:

  • preparing config for setting user-agent support
  • Allows setting user-agent for fetching feeds.

I'm still on the fence about the Maildir stuff, but these look good (and they'll fix this). Can you squash them into a single commit, add your Signed-off-by, and submit them as a separate PR?

@andresmrm
Copy link
Author

I can try, but I'm a bit lost about how to do it...
I cloned wking/rss2email repo, did the changes again, but now I don't know how to submit this as a PR to GitHub...
I cannot fork the repo, because I already have a forked version. Should I delete the fork and recreate it?

@wking
Copy link
Owner

wking commented Dec 16, 2015

On Tue, Dec 15, 2015 at 04:30:28PM -0800, Andrés Martano wrote:

I cloned wking/rss2email repo, did the changes again, but now I
don't know how to submit this as a PR to GitHub... I cannot fork
the repo, because I already have a forked version. Should I delete
the fork and recreate it?

No need for a new clone, just make a new branch. In a local rss2email
repository:

$ git remote -v

will list all of your remotes. You should have one for 1, but if
you don't, add it with something like:

$ git remote add andresmrm https://github.com/andresmrm/rss2email.git

You'll also want a remote for this repo. If you don't have one
already, add it with something like:

$ git remote add wking https://github.com/wking/rss2email.git

Fetch my current branches:

$ git fetch wking

Create a new branch off of my master:

$ git checkout -b user-agent-config wking/master

Pull in your original work, signing as you go:

$ git cherry-pick -s b56cbd2 92a7b96

Squash them into a single commit:

$ git rebase -i wking/master

edit to replace ‘pick’ with ‘squash’ for “Allows setting user-agent
for fetching feeds”, and close your editor. After squashing, Git will
drop you back into your editor so you can write a new commit message
for the unified commit. Do that and close your editor. Then push the
new branch to your GitHub remote:

$ git push andresmrm user-agent-config

and create a pull request against my master from that branch.

And let me know if you need more help with any particular part of that
;).

@andresmrm
Copy link
Author

Wow! Thanks for all the help with Git. Helped a lot! =D
Made a PR:
#76
I'm not sure if I did the Signed-off-by part right. Git added this line for each cherry-picked. I added another one just after the commit message. If I did anything wrong, please tell me, I'll just need a little more help with the git commands to correct it. =P

@Ekleog
Copy link

Ekleog commented Apr 15, 2019

@andresmrm The maildir part of this has been merged to https://github.com/rss2email/rss2email (new home of rss2email following maintainer changes), and the user-agent part of it is at #76 ; care to close this PR? :)

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.

4 participants