Skip to content

docs(contributing): add git worktree and rebase workflow guide - #189992

Merged
auto-submit[bot] merged 2 commits into
masterfrom
worktreesdoc
Jul 24, 2026
Merged

auto-submit[bot] merged 2 commits into
masterfrom
worktreesdoc

Conversation

@jtmcdole

Copy link
Copy Markdown
Member

Documentation for worktree and other git features. Making an internal doc public.

@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jul 24, 2026
@jtmcdole
jtmcdole requested review from Piinks and reidbaker July 24, 2026 17:22
@github-actions github-actions Bot added c: contributor-productivity Team-specific productivity, code health, technical debt. framework flutter/packages/flutter repository. See also f: labels. d: docs/ flutter/flutter/docs, for contributors labels Jul 24, 2026

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request adds a new contributor guide, 'docs/contributing/git-worktrees.md', which explains how to use Git worktrees and modern Git commands for Flutter development. Feedback on the document points out an incomplete description in the frontmatter, several grammatical and typographical errors, an inconsistent reference to the 'main' branch instead of 'master', and a broken markdown link.

Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
Comment thread docs/contributing/git-worktrees.md Outdated
@jtmcdole
jtmcdole requested a review from reidbaker July 24, 2026 17:43
@jtmcdole jtmcdole added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 24, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Jul 24, 2026

#### Code Reviews

Instead of doing code reviews on [github.com](https://github.com) and lacking the feature rich dart analyzer, or being able to use an agent and other advanced tooling; check out the PR locally.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggest inverting this. Something like:
"To review a PR check it out locally. Unlike the GitHub UI, this lets you ..."

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yeah, that's fair. This document is living, so pull requests welcome!

~/flutter/
├── .bare/ (The bare repo or main tracking folder)
├── .git (pointer to .bare/)
├── fswitch.sh ("fswitch" command line with tab completion - win32:.ps1)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this file in the repo somewhere? How do I get it?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

You follow the link above: flutter_worktree

Merged via the queue into master with commit a74d9b7 Jul 24, 2026
25 checks passed
@auto-submit
auto-submit Bot deleted the worktreesdoc branch July 24, 2026 19:33
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 24, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Jul 25, 2026
flutter/flutter@b65f4d9...e292197

2026-07-25 [email protected] Roll Skia from 2c014dc494f1 to 62442d6cf0ec (1 revision) (flutter/flutter#190022)
2026-07-25 [email protected] Roll Skia from d8d20eef4dbd to 2c014dc494f1 (1 revision) (flutter/flutter#190020)
2026-07-25 [email protected] [Impeller] Add 2D texture array support (kTexture2DArray) (flutter/flutter#188778)
2026-07-24 [email protected] Bumped Engine AGP Dependencies to 9.1.0 for 3.50 (flutter/flutter#189417)
2026-07-24 [email protected] Roll Dart SDK from 153abd9a8296 to 28e63ac22d8d (2 revisions) (flutter/flutter#190013)
2026-07-24 [email protected] ci: add mac verify binaries workflow (flutter/flutter#190010)
2026-07-24 [email protected] Roll Skia from f2f9b52fe1ee to d8d20eef4dbd (21 revisions) (flutter/flutter#190011)
2026-07-24 [email protected] fix(ci): quote labels to fix yaml mapping error (flutter/flutter#190002)
2026-07-24 [email protected] Update contributing guidelines for commit message format (flutter/flutter#189922)
2026-07-24 [email protected] Migrate a11y_assessments to uiscene (flutter/flutter#189960)
2026-07-24 [email protected] docs(contributing): add git worktree and rebase workflow guide (flutter/flutter#189992)
2026-07-24 [email protected] Roll Dart SDK from e3fc57eae9eb to 153abd9a8296 (3 revisions) (flutter/flutter#189987)
2026-07-24 [email protected] Rename RegularWindow* to Window* in the windowing API + rename sizedToContent to shrinkWrap in the windowing API (flutter/flutter#189363)
2026-07-24 [email protected] Remove ancient `tools:tools` dep from `android_sdk` bundle (flutter/flutter#189962)
2026-07-24 [email protected] Reduce the number of gtest-parallel workers when running Impeller tests on Mac Minis used by CI (flutter/flutter#189813)
2026-07-24 [email protected] Roll Packages from 8260a1e to 6969329 (21 revisions) (flutter/flutter#189983)
2026-07-24 [email protected] Roll Fuchsia Linux SDK from 9org0yL3yZkp80x5S... to Cdb1RGKCqpcz9z4cl... (flutter/flutter#189975)
2026-07-24 [email protected] Roll Skia from 6e9c4687c001 to f2f9b52fe1ee (3 revisions) (flutter/flutter#189959)
2026-07-24 [email protected] [web] Cancel touch pointers WebKit abandons mid-gesture (flutter/flutter#189608)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

c: contributor-productivity Team-specific productivity, code health, technical debt. CICD Run CI/CD d: docs/ flutter/flutter/docs, for contributors framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants