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
On Jul 3, 2015, at 2:00 AM, Tim Brown tim.br...@cityc.co.uk 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
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
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
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
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 cleme...@brinckerhoff.org wrote:
On Jul 2, 2015, at
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 working on other things, and these are
now not able to be merged into
On Jul 2, 2015, at 6:34 AM, Tim Brown tim.br...@cityc.co.uk 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
On Jul 2, 2015, at 1:53 PM, John Clements cleme...@brinckerhoff.org wrote:
On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth alexan...@knauth.org 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
On Jul 2, 2015, at 7:52 PM, Alexander D. Knauth alexan...@knauth.org wrote:
On Jul 2, 2015, at 1:53 PM, John Clements cleme...@brinckerhoff.org wrote:
On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth alexan...@knauth.org
wrote:
After you resolve them you will (I think) need to `git
On Jul 2, 2015, at 7:31 AM, Alexander D. Knauth alexan...@knauth.org wrote:
On Jul 2, 2015, at 6:34 AM, Tim Brown tim.br...@cityc.co.uk 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
11 matches
Mail list logo
