Thanks Marcelo, that's a great alternative. Since the website does only
consist of 15 total additive commits that strategy would work. Since I'm
not a committer I'm not sure how simple that process is for an apache git
repo. @Luciano, is this something possible?
Alex Bozarth
Software Engineer
Spark Technology Center
E-mail: [email protected]
GitHub: github.com/ajbozarth
505 Howard
Street
San Francisco, CA
94105
United
States
From: Marcelo Vanzin <[email protected]>
To: [email protected]
Date: 07/12/2017 11:54 AM
Subject: Re: Feedback needed: Inital website import with move to apache
git
On Wed, Jul 12, 2017 at 11:44 AM, Alex Bozarth <[email protected]> wrote:
> The actual website code was written by @jkestelyn
> through 13 commits on top of the branch of livy (plus an initial commit
by
> Kostas Sakellis and a later bug fix by Jon Alter).
If that's the case, it should be possible to use "git format-patch" to
create separate patch files for each of those commits, then use "git
am" to apply those patches to the other repo, right?
There might be some manual work to make things work (e.g. if the
commits touch files that exist in the livy repo, instead of being
purely additive), but it shouldn't be hard.
Another option is to add the livy repo as a remote in your local clone
of the web site's repo, and use "git cherry-pick", and resolve
conflicts. Given it's not that many patches, it shouldn't be that hard
either.
--
Marcelo
