[oe] [meta-java] Commit duplication

Maxin B. John maxin.john at intel.com
Thu Oct 1 06:09:57 UTC 2015


Hi Erkka,

On Wed, Sep 23, 2015 at 08:37:40AM +0000, Kaaria, Erkka wrote:
> Hi,
> 
> There seem to have been a bad merge commit made December 17 2014 (http://git.yoctoproject.org/cgit/cgit.cgi/meta-java/commit/?id=12a0b10b35b1829eec11ea653af53d127a8b6fd1). This commit introduced duplicate commits into the git history (for example, http://git.yoctoproject.org/cgit/cgit.cgi/meta-java/commit/?id=8042dd1f8e3ccee2ddb31e792e3f88c6e2583847 and http://git.yoctoproject.org/cgit/cgit.cgi/meta-java/commit/?id=7b66b4940804b72150b33248b16b582ae6a48751). These duplications are causing issues with certain tools.
>

Yes, those commits looks really weird. However, fixing those commits 
to make it work with tools like "combo-layer" might require some git 
related work and a "force push".

Would that be acceptable for all to do a force push on the upstream 
repository ?

Best Regards,
Maxin



More information about the Openembedded-devel mailing list