[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Paplay or Aplay Confusion

From: Chris Brannon
Subject: Paplay or Aplay Confusion
Date: Mon, 16 Aug 2010 08:21:39 -0500

Trevor Saunders wrote:
> agreed, is any body currently working on much of this?  I'd rather not repeat
>  what others are working on.

I started earlier this morning.
Here's a description of the steps I had to take.

1. Extract patches from the other repository.
2. Find the ancestor from which the fork diverged, and create
a branch from it.
3. Apply patches.  A few had conflicts that needed to be manually
resolved.  There were commits made after the ancestor and before the
set of patches that I want to incorporate, and these caused conflicts.
4. Now we have our patch set, based off of a common ancestor.  So
rebase against master.

I'm about half-way through step 4.

-- Chris

reply via email to

[Prev in Thread] Current Thread [Next in Thread]