Re: [Freemint-discuss] Bintray integration / git force-push needed

[Miro K. <mir...@gm...>]

Hi David,

On 14 March 2018 at 06:13, David Gálvez <dga...@gm...> wrote:
>
> I've observed something weird after the repository's clean up:
>
> Look the history of the file sys/mint/arch/delay.h
>
> https://github.com/freemint/freemint/commits/master/sys/mint/arch/delay.h
>
> the commit from Jun 26 2014 "Merge from Trunk"
>
> This commit seems from some Alan's branch not the trunk


This is OK -- one of the changes I've made is to make Alan's "usbtos"
branch a real git branch. That means that you can follow the initial fork,
its separate commits and then merge back to master. In CVS/former git
repository it was really messed up and while it has very little meaning I
did it as a nice git exercise (yes, I regretted it later ;)).

Content-wise it should be the same, i.e. there shouldn't be any differences
against the commit after the old CVS "merge" point.

-- 
MiKRO / Mystic Bytes
http://mikro.atari.org