micropython-branch-manager 2.0.3__tar.gz → 2.1.1__tar.gz

micropython_branch_manager-2.0.3/.cache/pip/http-v2/d/8/7/1/b/d871bc55adf567ea2c49a2de02d30bfa1a66046fb62fe2b0b5e5e1b3.body → micropython_branch_manager-2.1.1/.cache/pip/http-v2/c/9/1/f/5/c91f580d88bf83782e78be42725d05696c3911af8667eb629ddc701e.body

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uv
-Version: 0.11.1
+Version: 0.12.17
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -36,13 +36,6 @@ Project-URL: Repository, https://github.com/astral-sh/uv
 
 # uv
 
-[![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
-[![image](https://img.shields.io/pypi/v/uv/0.11.1.svg)](https://pypi.python.org/pypi/uv)
-[![image](https://img.shields.io/pypi/l/uv/0.11.1.svg)](https://pypi.python.org/pypi/uv)
-[![image](https://img.shields.io/pypi/pyversions/uv/0.11.1.svg)](https://pypi.python.org/pypi/uv)
-[![Actions status](https://github.com/astral-sh/uv/actions/workflows/ci.yml/badge.svg)](https://github.com/astral-sh/uv/actions)
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?logo=discord&logoColor=white)](https://discord.gg/astral-sh)
-
 An extremely fast Python package and project manager, written in Rust.
 
 <p align="center">
@@ -58,13 +51,13 @@ An extremely fast Python package and project manager, written in Rust.
 - A single tool to replace `pip`, `pip-tools`, `pipx`, `poetry`, `pyenv`, `twine`, `virtualenv`, and
   more.
 - [10-100x faster](https://github.com/astral-sh/uv/blob/main/BENCHMARKS.md) than `pip`.
-- Provides [comprehensive project management](https://github.com/astral-sh/uv/blob/0.11.1/README.md#projects), with a
+- Provides [comprehensive project management](https://github.com/astral-sh/uv/blob/0.12.17/README.md#projects), with a
   [universal lockfile](https://docs.astral.sh/uv/concepts/projects/layout#the-lockfile).
-- [Runs scripts](https://github.com/astral-sh/uv/blob/0.11.1/README.md#scripts), with support for
+- [Runs scripts](https://github.com/astral-sh/uv/blob/0.12.17/README.md#scripts), with support for
   [inline dependency metadata](https://docs.astral.sh/uv/guides/scripts#declaring-script-dependencies).
-- [Installs and manages](https://github.com/astral-sh/uv/blob/0.11.1/README.md#python-versions) Python versions.
-- [Runs and installs](https://github.com/astral-sh/uv/blob/0.11.1/README.md#tools) tools published as Python packages.
-- Includes a [pip-compatible interface](https://github.com/astral-sh/uv/blob/0.11.1/README.md#the-pip-interface) for a performance boost with a familiar
+- [Installs and manages](https://github.com/astral-sh/uv/blob/0.12.17/README.md#python-versions) Python versions.
+- [Runs and installs](https://github.com/astral-sh/uv/blob/0.12.17/README.md#tools) tools published as Python packages.
+- Includes a [pip-compatible interface](https://github.com/astral-sh/uv/blob/0.12.17/README.md#the-pip-interface) for a performance boost with a familiar
   CLI.
 - Supports Cargo-style [workspaces](https://docs.astral.sh/uv/concepts/projects/workspaces) for
   scalable projects.
@@ -315,7 +308,7 @@ It's pronounced as "you - vee" ([`/juː viː/`](https://en.wikipedia.org/wiki/He
 
 #### How should I stylize uv?
 
-Just "uv", please. See the [style guide](https://github.com/astral-sh/uv/blob/0.11.1/STYLE.md#styling-uv) for details.
+Just "uv", please. See the [style guide](https://github.com/astral-sh/uv/blob/0.12.17/STYLE.md#styling-uv) for details.
 
 #### What platforms does uv support?
 
@@ -344,9 +337,9 @@ for Windows support.
 
 uv is licensed under either of
 
-- Apache License, Version 2.0, ([LICENSE-APACHE](https://github.com/astral-sh/uv/blob/0.11.1/LICENSE-APACHE) or
+- Apache License, Version 2.0, ([LICENSE-APACHE](https://github.com/astral-sh/uv/blob/0.12.17/LICENSE-APACHE) or
   <https://www.apache.org/licenses/LICENSE-2.0>)
-- MIT license ([LICENSE-MIT](https://github.com/astral-sh/uv/blob/0.11.1/LICENSE-MIT) or <https://opensource.org/licenses/MIT>)
+- MIT license ([LICENSE-MIT](https://github.com/astral-sh/uv/blob/0.12.17/LICENSE-MIT) or <https://opensource.org/licenses/MIT>)
 
 at your option.
 

micropython_branch_manager-2.1.1/.cache/pip/selfcheck/fe300af6f7d708c14827daac3afc81fbb8306b73de8dd6e3f1f8ea3b

@@ -0,0 +1 @@
+{"key":"/usr/local","last_check":"2026-09-22T00:08:41.848944+00:00","pypi_version":"26.2.1"}

micropython_branch_manager-2.0.3/README.md → micropython_branch_manager-2.1.1/PKG-INFO

@@ -1,3 +1,19 @@
+Metadata-Version: 2.5
+Name: micropython-branch-manager
+Version: 2.1.1
+Summary: Tool for managing MicroPython fork integration branches
+Project-URL: Homepage, https://gitlab.com/alelec/micropython-branch-manager
+Project-URL: Repository, https://gitlab.com/alelec/micropython-branch-manager.git
+Project-URL: Issues, https://gitlab.com/alelec/micropython-branch-manager/-/issues
+Author-email: Andrew Leech <andrew@alelec.net>
+License-Expression: MIT
+License-File: LICENSE
+Requires-Python: >=3.11
+Requires-Dist: cyclopts>=3.0
+Requires-Dist: pydantic>=2.0
+Requires-Dist: tomli-w>=1.0
+Description-Content-Type: text/markdown
+
 # micropython-branch-manager
 
 Tool for managing MicroPython fork integration branches.
@@ -8,7 +24,7 @@ Tool for managing MicroPython fork integration branches.
 
 - Rebasing integration branches onto upstream with preserved merge commits
 - Adding PRs from upstream via merge commits
-- Tracking branch metadata in versioned JSON config
+- Tracking branch metadata in a versioned TOML config
 - Safety checks for remote divergence
 - Generating GitLab MR URLs
 
@@ -46,12 +62,16 @@ mbm init --integration-branch main
 
 ### Rebase integration branch
 
-Rebase the integration branch and all feature branches onto upstream:
+Rebuild the integration branch from upstream and every configured PR that is still open or closed:
 
 ```bash
 mbm rebase upstream/master
 ```
 
+Before training rerere or changing branches, mbm asks GitHub for each configured PR's state. A PR reported as merged is skipped: mbm does not fetch, rebase, merge, or push its feature branch. The command prints the skipped branch and PR number.
+
+This check requires an installed and authenticated GitHub CLI (`gh`). If GitHub cannot be queried, mbm prints a warning and retains the previous behavior of processing every configured branch.
+
 Options:
 - `--local` - Skip fetch and push operations
 - `--dry-run` - Show what would happen without making changes
@@ -78,12 +98,14 @@ The command will:
 
 ### Sync configuration
 
-Update JSON config to match current merge commit history. Requires a GitHub username to look up PR metadata:
+Update the TOML config from current merge commit history and look up PR metadata:
 
 ```bash
 mbm sync <github-username>
 ```
 
+When GitHub reports that a configured PR is merged, `sync` prints an informational message even if the branch no longer appears in integration merge history. It does not remove the entry from `mbm.toml`; retain or remove it deliberately, for example when a downstream pin must remain during a staged rollout.
+
 ### Show configuration
 
 Display current configuration:
@@ -111,7 +133,7 @@ mbm init
 #   - gitlab: git@gitlab.example.com:yourname/micropython.git
 #   - upstream: https://github.com/micropython/micropython.git
 #
-# Created .micropython-branches.json
+# Config: /path/to/mbm.toml
 ```
 
 ### Adding PRs to the integration branch
@@ -186,34 +208,26 @@ The MR creation URL pre-fills the title and description with all integrated bran
 
 ## Configuration File
 
-The configuration file `.micropython-branches.json` is auto-generated by `mbm init` and updated by other commands. It should not be edited manually.
+`mbm.toml` records the integration branch and the PRs that mbm manages. `mbm init` creates it; `mbm add-pr` and `mbm sync` update it. In parent-repository mode it belongs beside the MicroPython submodule and is intended to be committed with that repository.
 
 Example configuration:
 
-```json
-{
-  "_generated_by": "micropython-branch-manager (mbm) - do not edit manually",
-  "integration_branch": "main",
-  "remotes": {
-    "upstream": "https://github.com/micropython/micropython.git",
-    "andrewleech": "https://github.com/andrewleech/micropython.git"
-  },
-  "branches": [
-    {
-      "name": "feature-branch-1",
-      "remote": "andrewleech",
-      "pr_url": "https://github.com/micropython/micropython/pull/12345",
-      "pr_number": 12345,
-      "title": "Add feature X"
-    }
-  ]
-}
+```toml
+# micropython-branch-manager (mbm)
+path = "src/micropython"
+integration_branch = "main"
+
+[[branches]]
+name = "feature-branch-1"
+pr_url = "https://github.com/micropython/micropython/pull/12345"
+pr_number = 12345
+title = "Add feature X"
 ```
 
 Fields:
-- `integration_branch` - The branch that integrates all feature branches
-- `remotes` - Git remotes used by the tool (auto-detected from git config)
-- `branches` - List of integrated feature branches with their metadata
+- `path` - Path to the MicroPython submodule, relative to `mbm.toml`
+- `integration_branch` - The branch rebuilt from upstream and configured PRs
+- `branches` - Ordered feature branches and their PR metadata
 
 ## Workflow
 
@@ -264,14 +278,16 @@ Each feature branch forks directly from `upstream/master`, and all merges flow i
 ### Typical rebase workflow
 
 1. Fetch latest from all remotes
-2. Create update branch from target (e.g., `upstream/master`)
-3. For each PR in config order:
+2. Query GitHub for the state of each configured PR
+3. Skip PRs already merged upstream
+4. Create update branch from target (e.g., `upstream/master`)
+5. For each remaining PR in config order:
    - Fetch fresh PR content from upstream
    - Rebase onto target
    - Merge into update branch
-4. Push feature branches to their GitHub forks
-5. Push update branch to GitLab
-6. Display GitLab MR URL for review
+6. Push remaining feature branches to their GitHub forks
+7. Push update branch to GitLab
+8. Display GitLab MR URL for review
 
 ### Push strategy
 
@@ -353,7 +369,7 @@ uv run pre-commit run --all-files
 
 - Python 3.11+
 - Git
-- GitHub CLI (`gh`) - for PR metadata lookup
+- GitHub CLI (`gh`) - for PR metadata lookup and automatic merged-PR skipping
   - Install: https://cli.github.com/
   - Authenticate: `gh auth login`
 

micropython_branch_manager-2.0.3/PKG-INFO → micropython_branch_manager-2.1.1/README.md

@@ -1,15 +1,3 @@
-Metadata-Version: 2.4
-Name: micropython-branch-manager
-Version: 2.0.3
-Summary: Tool for managing MicroPython fork integration branches
-License-Expression: MIT
-License-File: LICENSE
-Requires-Python: >=3.11
-Requires-Dist: cyclopts>=3.0
-Requires-Dist: pydantic>=2.0
-Requires-Dist: tomli-w>=1.0
-Description-Content-Type: text/markdown
-
 # micropython-branch-manager
 
 Tool for managing MicroPython fork integration branches.
@@ -20,7 +8,7 @@ Tool for managing MicroPython fork integration branches.
 
 - Rebasing integration branches onto upstream with preserved merge commits
 - Adding PRs from upstream via merge commits
-- Tracking branch metadata in versioned JSON config
+- Tracking branch metadata in a versioned TOML config
 - Safety checks for remote divergence
 - Generating GitLab MR URLs
 
@@ -58,12 +46,16 @@ mbm init --integration-branch main
 
 ### Rebase integration branch
 
-Rebase the integration branch and all feature branches onto upstream:
+Rebuild the integration branch from upstream and every configured PR that is still open or closed:
 
 ```bash
 mbm rebase upstream/master
 ```
 
+Before training rerere or changing branches, mbm asks GitHub for each configured PR's state. A PR reported as merged is skipped: mbm does not fetch, rebase, merge, or push its feature branch. The command prints the skipped branch and PR number.
+
+This check requires an installed and authenticated GitHub CLI (`gh`). If GitHub cannot be queried, mbm prints a warning and retains the previous behavior of processing every configured branch.
+
 Options:
 - `--local` - Skip fetch and push operations
 - `--dry-run` - Show what would happen without making changes
@@ -90,12 +82,14 @@ The command will:
 
 ### Sync configuration
 
-Update JSON config to match current merge commit history. Requires a GitHub username to look up PR metadata:
+Update the TOML config from current merge commit history and look up PR metadata:
 
 ```bash
 mbm sync <github-username>
 ```
 
+When GitHub reports that a configured PR is merged, `sync` prints an informational message even if the branch no longer appears in integration merge history. It does not remove the entry from `mbm.toml`; retain or remove it deliberately, for example when a downstream pin must remain during a staged rollout.
+
 ### Show configuration
 
 Display current configuration:
@@ -123,7 +117,7 @@ mbm init
 #   - gitlab: git@gitlab.example.com:yourname/micropython.git
 #   - upstream: https://github.com/micropython/micropython.git
 #
-# Created .micropython-branches.json
+# Config: /path/to/mbm.toml
 ```
 
 ### Adding PRs to the integration branch
@@ -198,34 +192,26 @@ The MR creation URL pre-fills the title and description with all integrated bran
 
 ## Configuration File
 
-The configuration file `.micropython-branches.json` is auto-generated by `mbm init` and updated by other commands. It should not be edited manually.
+`mbm.toml` records the integration branch and the PRs that mbm manages. `mbm init` creates it; `mbm add-pr` and `mbm sync` update it. In parent-repository mode it belongs beside the MicroPython submodule and is intended to be committed with that repository.
 
 Example configuration:
 
-```json
-{
-  "_generated_by": "micropython-branch-manager (mbm) - do not edit manually",
-  "integration_branch": "main",
-  "remotes": {
-    "upstream": "https://github.com/micropython/micropython.git",
-    "andrewleech": "https://github.com/andrewleech/micropython.git"
-  },
-  "branches": [
-    {
-      "name": "feature-branch-1",
-      "remote": "andrewleech",
-      "pr_url": "https://github.com/micropython/micropython/pull/12345",
-      "pr_number": 12345,
-      "title": "Add feature X"
-    }
-  ]
-}
+```toml
+# micropython-branch-manager (mbm)
+path = "src/micropython"
+integration_branch = "main"
+
+[[branches]]
+name = "feature-branch-1"
+pr_url = "https://github.com/micropython/micropython/pull/12345"
+pr_number = 12345
+title = "Add feature X"
 ```
 
 Fields:
-- `integration_branch` - The branch that integrates all feature branches
-- `remotes` - Git remotes used by the tool (auto-detected from git config)
-- `branches` - List of integrated feature branches with their metadata
+- `path` - Path to the MicroPython submodule, relative to `mbm.toml`
+- `integration_branch` - The branch rebuilt from upstream and configured PRs
+- `branches` - Ordered feature branches and their PR metadata
 
 ## Workflow
 
@@ -276,14 +262,16 @@ Each feature branch forks directly from `upstream/master`, and all merges flow i
 ### Typical rebase workflow
 
 1. Fetch latest from all remotes
-2. Create update branch from target (e.g., `upstream/master`)
-3. For each PR in config order:
+2. Query GitHub for the state of each configured PR
+3. Skip PRs already merged upstream
+4. Create update branch from target (e.g., `upstream/master`)
+5. For each remaining PR in config order:
    - Fetch fresh PR content from upstream
    - Rebase onto target
    - Merge into update branch
-4. Push feature branches to their GitHub forks
-5. Push update branch to GitLab
-6. Display GitLab MR URL for review
+6. Push remaining feature branches to their GitHub forks
+7. Push update branch to GitLab
+8. Display GitLab MR URL for review
 
 ### Push strategy
 
@@ -365,7 +353,7 @@ uv run pre-commit run --all-files
 
 - Python 3.11+
 - Git
-- GitHub CLI (`gh`) - for PR metadata lookup
+- GitHub CLI (`gh`) - for PR metadata lookup and automatic merged-PR skipping
   - Install: https://cli.github.com/
   - Authenticate: `gh auth login`
 

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.1}/pyproject.toml

@@ -2,6 +2,7 @@
 name = "micropython-branch-manager"
 dynamic = ["version"]
 description = "Tool for managing MicroPython fork integration branches"
+authors = [{ name = "Andrew Leech", email = "andrew@alelec.net" }]
 readme = "README.md"
 license = "MIT"
 requires-python = ">=3.11"
@@ -11,6 +12,11 @@ dependencies = [
     "tomli-w>=1.0",
 ]
 
+[project.urls]
+Homepage = "https://gitlab.com/alelec/micropython-branch-manager"
+Repository = "https://gitlab.com/alelec/micropython-branch-manager.git"
+Issues = "https://gitlab.com/alelec/micropython-branch-manager/-/issues"
+
 [project.scripts]
 micropython-branch-manager = "micropython_branch_manager.cli:main"
 mbm = "micropython_branch_manager.cli:main"

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.1}/src/micropython_branch_manager/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.0.3'
-__version_tuple__ = version_tuple = (2, 0, 3)
+__version__ = version = '2.1.1'
+__version_tuple__ = version_tuple = (2, 1, 1)
 
 __commit_id__ = commit_id = None

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.1}/src/micropython_branch_manager/branch_sync.py

@@ -66,6 +66,17 @@ def sync_config_with_branches(
     return modified
 
 
+def find_merged_branches(
+    config: SubmoduleConfig, pr_cache: dict[str, PRInfo]
+) -> list[BranchConfig]:
+    """Return configured branches whose pull requests are merged upstream."""
+    return [
+        branch
+        for branch in config.branches
+        if (pr := pr_cache.get(branch.name)) is not None and pr.state == "MERGED"
+    ]
+
+
 def validate_branches(config: SubmoduleConfig, detected_branches: list[str]) -> list[str]:
     """Validate config branches against detected branches.
 

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.1}/src/micropython_branch_manager/cli.py

@@ -7,9 +7,13 @@ from typing import Annotated
 
 import cyclopts
 
-from .branch_sync import extract_branches_from_merges, sync_config_with_branches
+from .branch_sync import (
+    extract_branches_from_merges,
+    find_merged_branches,
+    sync_config_with_branches,
+)
 from .config import CONFIG_FILENAME, MBMConfig, SubmoduleConfig, find_config
-from .exceptions import GitHubCLINotFound, MBMError
+from .exceptions import GitHubCLINotFound, GitHubError, MBMError
 from .git import GitRepo
 from .github import GitHubClient
 from .pr import PRManager
@@ -37,7 +41,7 @@ ConfigPathParam = Annotated[
     ),
 ]
 
-_SUBMODULE_CANDIDATES = [Path("src/micropython"), Path("micropython"), Path(".")]
+_SUBMODULE_CANDIDATES = [Path("src/micropython"), Path("micropython")]
 
 _GITHUB_URL_RE = __import__("re").compile(
     r"(?:https?://github\.com/|git@github\.com:)([^/]+/[^/]+?)(?:\.git)?$"
@@ -239,8 +243,16 @@ def sync(
         raise ValueError("sync requires a config file. Run 'mbm init' first.")
     git = GitRepo(sub_path)
 
-    # Detect branches
-    detected = extract_branches_from_merges(git, "upstream/master", sub.integration_branch)
+    # Detect branches — resolve integration branch to a local or remote ref
+    integration_ref = git.resolve_branch_ref(sub.integration_branch)
+    if not integration_ref:
+        print(
+            f"WARNING: Integration branch '{sub.integration_branch}' not found locally "
+            "or as a remote ref. No branches detected."
+        )
+        detected = []
+    else:
+        detected = extract_branches_from_merges(git, "upstream/master", integration_ref)
 
     # Detect upstream GitHub repo from remote URL
     from .github import PRInfo
@@ -253,7 +265,7 @@ def sync(
     try:
         github = GitHubClient(repo=gh_repo) if gh_repo else GitHubClient()
         pr_cache = github.get_pr_info_by_branches(gh_author)
-    except GitHubCLINotFound:
+    except (GitHubCLINotFound, GitHubError):
         pass
 
     # Look up individual branches not found in author cache
@@ -261,9 +273,15 @@ def sync(
         all_branches = set(detected) | {b.name for b in sub.branches}
         for branch_name in all_branches:
             if branch_name not in pr_cache:
-                pr = github.find_pr_by_branch(branch_name)
-                if pr:
-                    pr_cache[branch_name] = pr
+                try:
+                    pr = github.find_pr_by_branch(branch_name)
+                    if pr:
+                        pr_cache[branch_name] = pr
+                except GitHubError:
+                    pass
+
+    for branch in find_merged_branches(sub, pr_cache):
+        print(f"INFO: {branch.name}: PR #{pr_cache[branch.name].number} merged upstream")
 
     # Sync
     if sync_config_with_branches(sub, detected, pr_cache):
@@ -311,6 +329,6 @@ def main() -> None:
     """Entry point."""
     try:
         app()
-    except MBMError as e:
+    except (MBMError, ValueError) as e:
         print(f"Error: {e}", file=sys.stderr)
         sys.exit(1)

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.1}/src/micropython_branch_manager/git.py

@@ -63,20 +63,7 @@ class GitRepo:
     def fetch(self, remote: str = "--all") -> None:
         """Fetch from remote(s)."""
         self.run("submodule", "sync", "--recursive", check=False)
-
-        cmd = ["git", "fetch", remote]
-        result = subprocess.run(
-            cmd,
-            cwd=self.repo_path,
-            capture_output=True,
-            text=True,
-        )
-        if result.returncode != 0:
-            stderr = result.stderr.lower()
-            if "submodule" not in stderr or (
-                "fatal" in stderr and "submodule" not in stderr.split("fatal")[0]
-            ):
-                raise GitError(f"git fetch failed: {result.stderr}")
+        self.run("fetch", remote)
 
     def checkout(self, ref: str, create: bool = False, force: bool = False) -> None:
         """Checkout branch or ref."""
@@ -126,18 +113,23 @@ class GitRepo:
 
         Returns True if rebase completed successfully.
         """
-        for _ in range(100):  # safety bound
+        rebase_merge = self.git_dir() / "rebase-merge"
+        for _ in range(100):
             if self._get_conflicting_files():
                 return False
+            if not rebase_merge.exists():
+                return True
             try:
                 self.run("rebase", "--continue")
                 return True
             except GitError:
+                if self._get_conflicting_files():
+                    return False
                 continue
         return False
 
-    def merge(self, branch: str, message: str, no_ff: bool = True) -> None:
-        """Merge branch with optional no-ff.
+    def merge(self, branch: str, message: str, no_ff: bool = True, signoff: bool = False) -> None:
+        """Merge branch with optional no-ff and Signed-off-by trailer.
 
         Raises:
             MergeConflictError: If conflicts require manual resolution
@@ -145,6 +137,8 @@ class GitRepo:
         args = ["merge"]
         if no_ff:
             args.append("--no-ff")
+        if signoff:
+            args.append("--signoff")
         args.extend([branch, "-m", message])
 
         try:
@@ -188,6 +182,20 @@ class GitRepo:
         except GitError:
             return False
 
+    def resolve_branch_ref(self, branch: str) -> str | None:
+        """Resolve a branch name to a usable ref, checking local then remote tracking refs."""
+        if self.branch_exists(branch):
+            return branch
+        result = self.run(
+            "for-each-ref",
+            "--format=%(refname:short)",
+            f"refs/remotes/*/{branch}",
+            check=False,
+        )
+        if result:
+            return result.split("\n")[0]
+        return None
+
     def create_branch(self, name: str, start_point: str) -> None:
         """Create branch from start point."""
         self.run("branch", name, start_point)

{micropython_branch_manager-2.0.3 → micropython_branch_manager-2.1.1}/src/micropython_branch_manager/pr.py

@@ -74,30 +74,31 @@ class PRManager:
         print(f"Fetching PR #{pr_info.number} from upstream...")
         self._fetch_pr(pr_info)
 
-        # Update config
-        print("\nUpdating config...")
-        self.sub.branches.append(
-            BranchConfig(
-                name=pr_info.branch,
-                pr_url=pr_info.url,
-                pr_number=pr_info.number,
-                title=pr_info.title,
-            )
-        )
-        self.mbm_config.save(self.config_path)
-
         # Merge into update branch with trailers
         merge_msg = format_merge_message(
             branch_name=pr_info.branch,
+            integration=update_branch,
             title=pr_info.title,
             pr_number=pr_info.number,
             pr_url=pr_info.url,
             author=pr_info.author,
         )
         print(f"Merging {pr_info.branch} into {update_branch}...")
-        self.git.merge(pr_info.branch, merge_msg)
+        self.git.merge(pr_info.branch, merge_msg, signoff=True)
         print("Merge completed successfully")
 
+        # Update config only after merge succeeds
+        print("\nUpdating config...")
+        self.sub.branches.append(
+            BranchConfig(
+                name=pr_info.branch,
+                pr_url=pr_info.url,
+                pr_number=pr_info.number,
+                title=pr_info.title,
+            )
+        )
+        self.mbm_config.save(self.config_path)
+
         # Push update branch to GitLab
         gitlab_remote = find_gitlab_remote(self.git)
         if gitlab_remote: