Skip to content

Docs: Revise merge guide with web and CLI methods#15

Merged
attogram merged 1 commit intomainfrom
enhance-merge-docs
Aug 29, 2025
Merged

Docs: Revise merge guide with web and CLI methods#15
attogram merged 1 commit intomainfrom
enhance-merge-docs

Conversation

@google-labs-jules
Copy link
Copy Markdown
Contributor

This pull request completely restructures the docs/merging-base.md guide to be more user-friendly, addressing issue #13.

The updated document now provides two clear methods for merging the base repository:

  1. Easy Method (Web-Based): A new, detailed guide on using GitHub Codespaces to perform the entire merge process within the browser. This is for users who may not have a local development environment set up.
  2. Advanced Method (Command Line): The original instructions, now framed as an advanced option for users comfortable with the command line.

This new structure makes the process more accessible to a wider range of users.

Restructures the `docs/merging-base.md` guide to provide two distinct
workflows for merging the `base` repository into an existing project.

- Adds an "Easy Method" section that details how to perform the merge
  using a terminal within the GitHub Codespaces web-based environment.
  This provides a user-friendly option that does not require a local
  setup.
- Reframes the original instructions as an "Advanced Method" for users
  who prefer to use their local command line.

This change is the result of discussion and research into the best way
to provide a web-based workflow for this task.
@attogram attogram marked this pull request as ready for review August 29, 2025 18:59
@attogram attogram merged commit eebd890 into main Aug 29, 2025
1 check passed
@attogram attogram deleted the enhance-merge-docs branch August 29, 2025 18:59
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.

1 participant