djangocms-page-meta icon indicating copy to clipboard operation
djangocms-page-meta copied to clipboard

Published 20 hours ago • verified publisher icon nephila

Feature/meta robots

Open corentinbettiol opened this issue 4 years ago • 6 comments

See #116.

Add this: image

That will be rendered to this: image

corentinbettiol avatar Aug 26 '20 10:08 corentinbettiol

@corentinbettiol probably due to the many rebase and merges in #117 the diff looks a mix of this PR and 117 itself

Could you rebase this on current develop and ensure a clean diff? :bow

yakky avatar Aug 26 '20 20:08 yakky

I'm not really used to doing rebases, did I do what you wanted?

corentinbettiol avatar Aug 27 '20 14:08 corentinbettiol

I'm not really used to doing rebases, did I do what you wanted?

we have two options:

  • create a new branch from current develop and cherry-pick robots feature related commits
  • merge develop on top of the current robots branch and fix the conflicts (git checkout feature/meta-robots && git merge origin/develop -after syncing your fork develop with this repo)

I don't care about the commit history in PR as we are going to squash all the commits into one for merging

yakky avatar Aug 27 '20 18:08 yakky

What is the easiest method?

corentinbettiol avatar Sep 04 '20 13:09 corentinbettiol

What is the easiest method?

Sorry, I missed this comment

I'd go with the latter (merge develop on top of the current robots branch and fix the conflicts) because the conflict looks limited, according to the github report

yakky avatar Oct 07 '20 23:10 yakky

@corentinbettiol could you provide me the list on commits relevant to this PR? I will cherry pick and merge myself

yakky avatar Nov 01 '20 00:11 yakky