Good gods, rebasing is not working, conflicts galore.
https://gist.github.com/mrballcb/ac4e28d35979091a719c
I'm on the edge of creating a new ranch, then just creating one commit with
the code, one commit with the docs, and merging that branch.
...Todd
On Sat, Mar 30, 2013 at 4:08 PM, Phil Pennock <pdp@???> wrote:
> On 2013-03-30 at 08:29 -0700, Todd Lyons wrote:
> > On Fri, Mar 29, 2013 at 6:01 PM, Phil Pennock <notifications@???>
> wrote:
> > > Oh, and if you push to the same branch name, this pull request should
> update with the new history.
> >
> > To be extremely clear, you are saying that if I push to the same
> > branch name on *github*, the pull request should update with the new
> > history. You are NOT saying that if I push to the same branch name on
> > *tahini*.
> >
> > Please correct me if I'm wrong.
>
> Correct, but if you pushed the branch as a branch into the master repo
> on tahini it would make its way to GitHub and be equivalent.
>
> The only reason there's any disconnect is because all of the changes are
> in a branch in a separate repo on tahini, and this tahini personal repo
> is not automatically propagating the changes.
>
> -Phil
>
--
The total budget at all receivers for solving senders' problems is $0. If
you want them to accept your mail and manage it the way you want, send it
the way the spec says to. --John Levine
