master branch reset

[Geert Uytterhoeven]

On Tue, 5 Dec 2006, Grant Likely wrote:
> On 12/5/06, Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com> wrote:
> > On Mon, 4 Dec 2006, Paul Mackerras wrote:
> 
> > Any clues? Delete and reclone?
> 
> Because Paul had to redo his tree; you're no longer able to 'pull' his
> changes into your branch.  If you've got changes that you need to
> preserve; then you need to either generate a diff between Paul's old
> HEAD and your HEAD; then apply that to a new branch based of Paul's
> new HEAD.
> 
> Or; you can create a new branch based on the new HEAD and
> 'git-cherry-pick' your changes into it.
> 
> Either way, it can be rather painful.

I didn't make any local changes, so I assumed I could just follow Paul's
instructions. But they failed.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven at sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium