Re: accidental merge

2020-12-14 Thread Peter Lee
quot;. > >> then I made a small commit "TIKA-3248: avoid ClassCastException" of > >> about 10 lines. > >> > >> then "bad" things happened. > >> Ideally, the last three commits on top shouldn't have happened. > >> Tilman > >> Am 14.12.2020 um 06:51 schrieb Tilman Hausherr: > >>> Hi all, > >>> > >>> I made an accidental merge and I tried to revert it, but I suspect I > >>> made it worse. Still working on it... > >>> > >>> Tilman > >>> > > >

Re: accidental merge

2020-12-14 Thread Tilman Hausherr
of about 10 lines. then "bad" things happened. Ideally, the last three commits on top shouldn't have happened. Tilman Am 14.12.2020 um 06:51 schrieb Tilman Hausherr: Hi all, I made an accidental merge and I tried to revert it, but I suspect I made it worse. Still working on it... Tilman

Re: accidental merge

2020-12-13 Thread Peter Lee
, the last three commits on top shouldn't have happened. > Tilman > Am 14.12.2020 um 06:51 schrieb Tilman Hausherr: > > Hi all, > > > > I made an accidental merge and I tried to revert it, but I suspect I > > made it worse. Still working on it... > > > > Tilman > > >

Re: accidental merge

2020-12-13 Thread Tilman Hausherr
the last three commits on top shouldn't have happened. Tilman Am 14.12.2020 um 06:51 schrieb Tilman Hausherr: Hi all, I made an accidental merge and I tried to revert it, but I suspect I made it worse. Still working on it... Tilman

accidental merge

2020-12-13 Thread Tilman Hausherr
Hi all, I made an accidental merge and I tried to revert it, but I suspect I made it worse. Still working on it... Tilman