[ImageJ-devel] Big objects in the imglib2 repository

Johannes Schindelin Johannes.Schindelin at gmx.de
Tue May 21 09:19:53 CDT 2013


Hi Stephan,

On Tue, 21 May 2013, Stephan Saalfeld wrote:

> > > Do you have a good solution for removing it without breaking
> > > everybodies history?
> > 
> > There is no removing it without breaking everybody's history; in the
> > best case, people will just get merge conflicts, in the worst case,
> > they will add the large file back without realizing.
> 
> Ok.  But if I understand it correctly, we could clean up the repository
> for all future checkouts with little friction for all existing copies?
> What do you think about the following:
> 
> I commit the file as deleted.  We wait for a few days and announce that
> everybody may please pull to make sure that the file is gone.  Then, I
> rebase away the commit that first introduced the file and force push to
> master and the branch where it occurred.  Following pulls would may be
> claim a merge conflict that is easy to resolve.  What do you think.

That's not how Git works. The rebase would cause all the problems
mentioned in earlier mails. If you could dictate to everybody who cloned
ImgLib, it would be possible.

Ciao,
Johannes



More information about the ImageJ-devel mailing list