carbon-design-system / carbon-for-ibm-dotcom-website

This is the Carbon for IBM.com website, which includes documentation and guidelines around design and development for IBM.com
https://www.ibm.com/standards/carbon/
Apache License 2.0
39 stars 43 forks source link

Docs --content block v2 #1749

Closed RichKummer closed 9 months ago

RichKummer commented 9 months ago

Related Ticket(s)

Looks like content block didn't merge in v2 website. Seeing if this will fix

Description

{{Add a human-readable description / detail summary of what the PR is changing and any details around how and why}}

{{If applicable, include a screenshot indicating an example or examples of what the PR is changing in the application}}

Changelog

New

Changed

Removed

ibmdotcom-bot commented 9 months ago

Deploy preview created: https://ibmdotcom-library.s3-web.us-south.cloud-object-storage.appdomain.cloud/deploy-previews/1749/index.html

Built with commit: 9c013d76828a82bb00ec329a4204fa649b6dac6c

oliviaflory commented 9 months ago

@RichKummer I am having a brief recall of why content block got messed up... there were quite a few conflicts because content block was opened off of my content section branch, and Kenny mentioned we shouldn't open PRs off of editing branches future.

Anyway, it looks like this PR has 3 months worth of commits and a ton of conflicts to resolve.. it might be best to start fresh rather than trying to navigate those.

RichKummer commented 9 months ago

@RichKummer I am having a brief recall of why content block got messed up... there were quite a few conflicts because content block was opened off of my content section branch, and Kenny mentioned we shouldn't open PRs off of editing branches future.

Anyway, it looks like this PR has 3 months worth of commits and a ton of conflicts to resolve.. it might be best to start fresh rather than trying to navigate those.

Totally, I'm going to close this and migrate the changes in a new branch. The number of conflicts was too much yesterday!