gg_merge

Changed

• UpdateProjectGit skips the pull when the current branch has no upstream left (remote branch merged and deleted, e.g. by an auto-completed pull request) and retries fetch and pull on transient network errors

Changed

• "Quiet
• "Tighten

Changed

• Warn when Azure PR metadata cannot provide a URL

Fixed

• IsBehindMain, IsAheadMain, CanMerge and LocalMerge use the repository's default branch instead of main
• WaitForMerge no longer aborts on the moment GitHub reports an auto-merged pull request as CLOSED; a CLOSED pull request with a merge date counts as merged

Added

• Shared Azure DevOps url helpers azurePullRequestWebUrl, azureRepositoryWebUrl and azureOrganizationUrl

Fixed

• WaitForMerge prints the web url of an Azure DevOps pull request instead of "the pull request of <branch>"

Changed

• Install the dna_ggsuite DNA

Changed

• Use ggwsm in pipelines

Fixed

• Fix Windows-specific test failures that blocked the review

Changed

• Rework copyright headers

Fixed

• Cleanup copy right headers. Update to dart 3.13. Auto fixes.
• Cleanup copy right headers. Update to dart 3.13. Auto fixes. Setup quick-check pipeline.

Changed

• Provide gg via npm
• Fix shell changes

Added

• --body on merge-git / do-merge: the pull-request description, separate from the title

Fixed

• Fix org-url repo add, code-workspace upkeep on rm and the auto-merge PR hint

Changed

• Improve commit behavior

Changed

• Allow to publish hybrid packages

Fixed

• HasLocalReferences — and with it can merge — inspects every manifest a repository carries instead of only the one detectProjectType picks. That one is pubspec.yaml whenever it exists, so a hybrid could carry a link: to a sibling checkout in its package.json, pass can merge, and publish a package.json nobody else can resolve.

Changed

• Allow to pass custom options to exec of dir commands.

Changed

• Merge origin/main and tighten dependency constraints (dart pub upgrade --tighten)

Changed

• Rename .master in .ocean

Changed

• Finetune command line output

Changed

• Prevent pubspec.lock interrupting publishing

Fixed

• Fix issues with pubspec.lock

Changed

• refactor: shorten all CLI help texts to 60 chars
• Improve coloring

Changed

• Prefix all gg-generated commit messages with "#gg: "; the unchanged-repo check treats such commits as not user generated

Changed

• Improve merge on github message

Changed

• Do not repeat poll messages while publishing or merging

Changed

• Support projects without manifest: ProjectType.none, checks skipped, version tracked as git tag only
• gg_multi: changed references to git

Added

• The pull request url is now surfaced everywhere the publish interacts with a PR: when it is created, when an existing PR is reused, and once at the start of the wait-for-merge poll ("Check the pull request status here: <url>", printed blue) — on GitHub from gh, on Azure DevOps built from repository.webUrl

Changed

• Show the pull request url on create, reuse and while waiting for the merge
• "Created pull request" / "Reusing existing pull request" messages are printed dark gray (url blue)
• Reuse only open pull requests; print PR messages dark gray
• Fall back to a direct squash merge when auto-merge is not allowed
• Never merge a pull request automatically; pass the PR source branch to the wait
• Handle auto merge when github does not support auto merge

Fixed

• gg never merges a pull request on its own: when the provider rejects auto-merge, the PR stays open and the publish waits for the manual merge (the merge stays an explicit human decision)
• WaitForMerge accepts the pull request's source branch, so the wait no longer looks for a pull request of the default branch when HEAD moved on ("No pull request found for branch main")
• PR reuse now only considers OPEN pull requests. Before, a merged pull request of an earlier release on the same branch was "reused", so wait-for-merge saw »merged« immediately although the new release content was never merged to main

Added

• Add --pr support: PR created plain with URL logged, auto-merge best-effort with strategy detection and squash retry, new --delete-source-branch flag

Changed

• Always squash-merge pull requests and use the merge message as PR title and squash commit message
• Share the origin-url lookup, use named arguments in MergeGit internals and unify the best-effort automerge warning
• gg_multi: changed references to git

Changed

• gg_multi: changed references to git

Changed

• feat: merge via auto-complete pull request on protected main (Azure) and wait until merged

Changed

• feat(gg): do checkout + .gg/.ticket.json ticket marker; TS format no direct eslint & P:\programs\flutter/bin/internal/exit_with_errorlevel.bat
• gg_multi: changed references to git

Changed

• gg_multi: changed references to git

Changed

• gg_multi: changed references to git

Changed

• feat: TS-aware HasLocalReferences/HasGitReferences via gg_lang dispatch
• gg_multi: changed references to git
• Gg Multi: changed references to pub.dev
• gg_multi: changed references to git

Added

• LocalMerge constructor: runPubGet flag (default true) to skip the pub-get + lockfile staging step. Useful for tests that drive LocalMerge through DoMerge with a real GgProcessWrapper

Fixed

• local-merge: run dart pub get (or flutter pub get) and stage pubspec.lock between the squash merge and the commit, so the updated lockfile is part of the squash commit instead of being left dirty by VS Code's auto pub get after the fact

Added

• Add .gitattributes file

Removed

• Remove push to origin/main from local merge and related test

• Update to gg_git 3.0.0

Removed

• remove has git references from can merge

Added

• add tests for local merge option
• Add merge message for squash
• Initial version of gg_merge

Changed

• prepare version 1.0.1