Add custom branch workflow docs and ignore local recovery bundles - #267
Open
UcnacDx2 wants to merge 1 commit into
Open
Add custom branch workflow docs and ignore local recovery bundles#267UcnacDx2 wants to merge 1 commit into
UcnacDx2 wants to merge 1 commit into
Conversation
Owner
Author
|
❌ CI Check 失败 点击展开错误详情``` Resolving dependencies... Could not find a file named "pubspec.yaml" in https://github.com/bggRGjQaUbCoE/flutter_file_picker.git 4c03c3413a915fa82f58d4591bfe3b62709a6edf. Failed to update packages. |
There was a problem hiding this comment.
Pull request overview
Adds repository documentation for a custom branch-splitting workflow (including recovery snapshots and a topic-branch map) and updates .gitignore to prevent committing local recovery bundles under .backup/.
Changes:
- Add
docs/custom-branch-workflow.mddescribing the protectedworkbranch, recovery snapshot strategy, topic refs, and an update/replay procedure. - Update
.gitignoreto ignore.backup/and normalize thetest.dartignore entry formatting.
Reviewed changes
Copilot reviewed 1 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| docs/custom-branch-workflow.md | New documentation covering branch split rationale, recovery points, topic branch map, and replay/update steps. |
| .gitignore | Adds ignore rule for .backup/ and tidies the test.dart entry formatting. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+70
to
+74
| ```bash | ||
| git switch -c adapted/<upstream-version> base/upstream-main | ||
| ``` | ||
|
|
||
| 3. Replay topics in dependency order. Prefer cherry-picking only the commits unique to each topic; use `git log base/local-official-snapshot..custom/<topic>` to inspect each range first. |
Comment on lines
+108
to
+109
| git switch -c split/<topic> base/upstream-main | ||
| git cherry-pick <commit-or-range-for-that-topic> |
| git cherry-pick <commit-or-range-for-that-topic> | ||
| ``` | ||
|
|
||
| Keep `work` as a protected historical branch, and do new development on `adapted/<version>` plus `custom/*` topic branches. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
.backup/directory.Description
docs/custom-branch-workflow.mddescribing the protection of the original work branch, the topic-oriented refs, a branch map of current topic anchors, recovery snapshot guidance, and recommended update/replay steps..gitignoreto add.backup/and fix a trailing-newline inconsistency fortest.dartso local recovery bundles are excluded from commits.Testing
Codex Task