Skip to content

Conversation

@ashishksdev
Copy link

This PR adds the site/content/blog content to the blogs branch as requested in #2774.

Does this PR introduce any user-facing change?

No — this moves documentation content to the designated branch.

How was this patch tested?

The blog folder site/content/blog was copied from the upstream main branch and committed to this blogs branch. Folder structure was verified.

CHANGELOG.md

Not applicable

Copy link
Contributor

@dimas-b dimas-b left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to do CI changes related to building the site from multiple branches (main / versioned-docs / blogs) first, then move existing blogs to the new branch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to delete (irrelevant) doc files in a separate PR for the sake of clarity.

linkTitle: Getting Started
type: docs
weight: 101
title: Apache Polaris 1.0.1-incubating has been released!
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this changing when we just "move" blogs?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, it should not be necessary to change existing blog files, I think. If the blogs branch is created from main, it should already have all the blog files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Github messed up when it generates diffs. It's a new file, instead of changes.

@ashishksdev
Copy link
Author

Thanks for the feedback @dimas-b

I understand the CI changes should come first.
Regarding the file changes - I branched off from upstream/blogs (which was created from versioned-docs, not main). I removed the existing files and added the blog content from main, as requested by @flyrain in issue #2774.

I notice the PR is showing some files as "modified" (with red/green changes) when they should just show as "deleted". These are files from the old versioned-docs content - I'm not sure why Git is showing them as modifications instead of clean deletions. The actual blog content I'm adding is just the site/content/blog folder.

A few questions on next steps:

  1. Should I wait for the CI changes to be completed before proceeding, or would you like me to fix the Git tracking issue now?
  2. Regarding the doc file deletion mentioned - if this PR continues, should I remove that change and handle it in a separate PR?
    Thank you!

@dimas-b
Copy link
Contributor

dimas-b commented Oct 29, 2025

@ashishksdev : I commented on the issue: #2774 (comment)

@flyrain
Copy link
Contributor

flyrain commented Oct 29, 2025

Thanks a lot for working on it, @ashishksdev ! As I mentioned here #2774 (comment), this PR is good as the first PR to add blog content to the new branch.

@flyrain
Copy link
Contributor

flyrain commented Oct 29, 2025

Do we need directory structure site/content/blog/*? We might remove that, and use the year directory(2025) directly.

#
title: "Doris X Polaris: Building Unified Data Lakehouse with Iceberg REST Catalog - A Practical Guide"
date: 2025-09-15
author: zy-kkk
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR alters git author associations for existing blogs. I believe this should be avoided.

@@ -17,10 +17,15 @@
# specific language governing permissions and limitations
# under the License.
#
linkTitle: 'Catalog API Spec'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another weird diffs. Should be just a new file.

@ashishksdev
Copy link
Author

ashishksdev commented Oct 30, 2025

Thanks for the feedback and discussion on this PR!

After reviewing the concerns raised, I realize this PR has several issues:

  1. Author information being unintentionally changed (as @dimas-b pointed out)
  2. Files showing as modifications instead of clean additions/deletions
  3. Cleanup of irrelevant files already in blogs (as it is based on versioned-docs) and addition of site/content/blog is in single PR, making it difficult to review

I'm going to close this PR and propose a cleaner approach:
My proposed plan:

  • PR 1st: Remove all existing content from the blogs branch (as @dimas-b preferred)
  • PR 2st: Add the blog content (2025 folder and _index.adoc) directly to the blogs branch, preserving original author information
    This keeps changes separated and cleaner for review.

Questions before I proceed:

  1. Does this two-PR approach work for you, or would you prefer a different workflow?
  2. What's the correct Git method to preserve author information when moving the blog content? Should I use git cherry-pick or another approach?
  3. Should I wait for the CI discussion to conclude first, or can I proceed with clearing/adding the blog content now?

Please let me know if you have any suggestions or a different approach in mind. Happy to follow whatever works best!
@flyrain @dimas-b

@github-project-automation github-project-automation bot moved this from PRs In Progress to Done in Basic Kanban Board Oct 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants