docker-opengl icon indicating copy to clipboard operation
docker-opengl copied to clipboard

Published 20 hours ago • verified publisher icon thewtex

docker-opengl centos branch rebased

Open MayeulChassagnard opened this issue 7 years ago • 3 comments

Can't automatically merge because the centos branch needs to be update with the master branch modifications (Makefile, etc.)

CC: @thewtex @jcfr

MayeulChassagnard avatar Oct 24 '16 17:10 MayeulChassagnard

I am merging master into centos, then the rebase and PR should work better...

thewtex avatar Oct 24 '16 19:10 thewtex

I have updated the centos branch by merging from master. Please rebase by cherry-picking this patch on centos. Let's use thewtex/opengl:centos for the images on this branch for now.

thewtex avatar Oct 24 '16 19:10 thewtex

Perhaps it would have been better to just set the centos branch on the same commit history as the master branch because there is lot of conflicts.. I'm still trying to rebase+cherry-pick..

MayeulChassagnard avatar Oct 24 '16 21:10 MayeulChassagnard