Re: [Colossus-developers] It is done. - was: Re: Java, Git, Maven, JWS, ...

On 4 June 2015 at 17:16, Clemens Katzer <cle...@cl...> wrote:

> > If it's still possible, can you change that to "ro...@do...
>
> It is possible, it's just a matter of work. I can reconvert all again
> and upload it; that's not a big deal (1-2 hours?)
>
> But how to glue / replay those new commits I made since then on top of
> the new imported/converted stuff - does anybody good idea how to do
> that?
>
> Or is there some other generally?


You dont need to re-import.

And I doubt anyone has already cloned your repo - so you could be cavalier
about rewriting history.
But in general you should avoid doing that because it borks everyone's
linked repos at that point.
Given where colossus-titan is in the git migration I think you can live
with that pain now.

How many commits are we talking about?

If its only a few then the first answer
http://stackoverflow.com/a/1320317/552958 using rebase -i would be the
easiest.
Otherwise using the git filter-branch (
http://git-scm.com/docs/git-filter-branch) option of the second answer
http://stackoverflow.com/a/870367/552958 would be the way to go.

Cheers
Barrie