Skip to content

Pull request for issue #11#12

Merged
attogram merged 1 commit intomainfrom
add-merge-guide
Aug 29, 2025
Merged

Pull request for issue #11#12
attogram merged 1 commit intomainfrom
add-merge-guide

Conversation

@google-labs-jules
Copy link
Copy Markdown
Contributor

Fixes #11

This commit introduces a new guide on how to merge the `base` repository into an existing project. The guide covers all the necessary steps, from adding `base` as a remote to handling merge conflicts and creating a pull request.

The new file `docs/merging-base.md` contains the comprehensive guide.

The main documentation file `docs/README.md` has been updated to include a link to this new guide, ensuring it is discoverable for users.
@attogram attogram marked this pull request as ready for review August 29, 2025 12:55
@attogram attogram merged commit 055f22a into main Aug 29, 2025
1 check passed
@attogram attogram deleted the add-merge-guide branch August 29, 2025 19:39
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.

Add doc: merge in guide

1 participant