Folks,
I have two pull requests related to my separation of "net/url-string"
from "net/url".
plt/racket #948 implementation of the separation
racket/net #4 test and documentation of the above
My problem is that I have been working on other things, and these are
now not able to be merged into the master. (I've tried "get pull
--ff-only..." as per Greg Hendershott's crib sheet)
How do I resolve this?
· Is there a way to find out what's blocking me, and get myself aligned
aligned with the upstream master? (I have changed nothing in the rest
of my plt/racket fork -- so I need to identify a conflict in my branch
changes)
· Do I reimplement the changes (not a problem except a new PR would lose
the old PR's comments which I'm not sure is a good thing)
· Can someone take it over? (That would be me inflicting work on others)
Any suggestions would be well received.
Tim
--
Tim Brown CEng MBCS <tim.br...@cityc.co.uk>
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
City Computing Limited · www.cityc.co.uk
City House · Sutton Park Rd · Sutton · Surrey · SM1 2AE · GB
T:+44 20 8770 2110 · F:+44 20 8770 2130
────────────────────────────────────────────────────────────────────────
City Computing Limited registered in London No:1767817.
Registered Office: City House, Sutton Park Road, Sutton, Surrey, SM1 2AE
VAT No: GB 918 4680 96
--
You received this message because you are subscribed to the Google Groups "Racket
Users" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to racket-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
