Re: [racket-users] help please on git/github pull request

2015-07-03 Thread Rickard Andersson
I think if there is a direction to go in, it's to make a SSH-friendly and truly extensible text version of DrRacket. I would use this all day; I only really use vim because it's terminal friendly and the editing is great. DrRacket offers a lot in terms of integration with Racket facilities and

Re: [racket-users] help please on git/github pull request

2015-07-03 Thread Joel McCracken
Am I correct in understanding that you are unfamiliar with rebasing? If so I would gladly pair with you on it. I do it all the time at work. Sent from my iPhone > On Jul 3, 2015, at 5:00 AM, Tim Brown wrote: > > Thanks for the help folks! > > I'll take a long hard look at rebasing before I d

Re: [racket-users] help please on git/github pull request

2015-07-03 Thread William G Hatch
On Fri, Jul 03, 2015 at 12:38:26PM -0400, Greg Hendershott wrote: Being git, there are probably a variety of ways to go about this. What I might try (but haven't verified first-hand): One-time setup: - On master, `git pull --ff-only upstream`. - On master, create from master a new branch named "

Re: [racket-users] help please on git/github pull request

2015-07-03 Thread William G Hatch
On Fri, Jul 03, 2015 at 12:38:26PM -0400, Greg Hendershott wrote: Being git, there are probably a variety of ways to go about this. What I might try (but haven't verified first-hand): One-time setup: - On master, `git pull --ff-only upstream`. - On master, create from master a new branch named "

Re: [racket-users] help please on git/github pull request

2015-07-03 Thread Greg Hendershott
Once upon a time I forked a repo, committed against master, and couldn't figure out how to "re-sync" with upstream. I resorted to deleting the fork and starting over. I wanted a sure-fire recipe to avoid that. Although I know a bit more about git now, I still follow that recipe. So far when I've

Re: [racket-users] help please on git/github pull request

2015-07-03 Thread 'John Clements' via users-redirect
> On Jul 3, 2015, at 2:00 AM, Tim Brown wrote: > > Thanks for the help folks! > > I'll take a long hard look at rebasing before I do anything. > It sounds like something my mother would have advised against. > > On 03/07/15 03:52, Alexander D. Knauth wrote: >> On Jul 2, 2015, at 1:53 PM, John

Re: [racket-users] help please on git/github pull request

2015-07-03 Thread Tim Brown
Thanks for the help folks! I'll take a long hard look at rebasing before I do anything. It sounds like something my mother would have advised against. On 03/07/15 03:52, Alexander D. Knauth wrote: On Jul 2, 2015, at 1:53 PM, John Clements wrote: On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth

Re: [racket-users] help please on git/github pull request

2015-07-02 Thread 'John Clements' via users-redirect
> On Jul 2, 2015, at 7:52 PM, Alexander D. Knauth wrote: > > > On Jul 2, 2015, at 1:53 PM, John Clements wrote: > >> >>> On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth >>> wrote: > >>> After you resolve them you will (I think) need to `git add` the files that >>> you resolved conflicts

Re: [racket-users] help please on git/github pull request

2015-07-02 Thread Alexander D. Knauth
On Jul 2, 2015, at 1:53 PM, John Clements wrote: > >> On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth wrote: >> After you resolve them you will (I think) need to `git add` the files that >> you resolved conflicts for, then >> `git rebase --continue`, and then when the rebase is finished, `gi

Re: [racket-users] help please on git/github pull request

2015-07-02 Thread 'John Clements' via users-redirect
> On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth wrote: > > > On Jul 2, 2015, at 6:34 AM, Tim Brown wrote: > >> 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

Re: [racket-users] help please on git/github pull request

2015-07-02 Thread Alexander D. Knauth
On Jul 2, 2015, at 6:34 AM, Tim Brown wrote: > 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 #4test and documentation of the above > > My problem is that I have been wor