Hello --
I can not apply updates on Pantheondue to GIT Conflict issue:
CONFLICT (rename/rename): Rename profiles/apigee/modules/contrib/ckeditor/PATCHES.txt->profiles/apigee/modules/contrib/redis/PATCHES.txt in e16ed803a42acf32ad83f275d51ee1cf5032921c. Rename profiles/apigee/modules/contrib/media/PATCHES.txt->profiles/apigee/modules/contrib/redis/PATCHES.txt in HEAD
Solved! Go to Solution.
You just need to refresh the Pantheon dashboard page. All updates have already been applied.
Hi @mnewman, If you give me the URL of your portal I can resolve this for you.
HI @Daniel Johnson --
Thank you for the response, is this something I can take care? The Portal is
http://dev-verizon-ventures.devportal.apigee.com/
Thank you for your assistance.
@mnewman I resolved your git conflict for you. Unfortunately since our Dev Portal upstream git repository is not public, this wasn't something you could have fixed for yourself.
Thank you for the update. The errors have now been removed however, when trying to apply developer service updates we now have an erroneous error?
You just need to refresh the Pantheon dashboard page. All updates have already been applied.
Thank You @Daniel Johnson