Skip to content

Commit 0918426

Browse files
omalleyandydependabot[bot]
andcommitted
chore(deps-dev): update chrome-devtools-frontend to version 1.0.1581449
Bumps the chrome-devtools-frontend dependency from version 1.0.1579812 to 1.0.1581449, including various updates and improvements across the codebase. Co-authored-by: dependabot[bot] <support@github.com>
1 parent 4b73529 commit 0918426

2 files changed

Lines changed: 144 additions & 0 deletions

File tree

docs/github-sync-and-merge.md

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# GitHub: Merge to Main and Sync
2+
3+
Use this checklist so **main** is up to date and everything is synced with GitHub.
4+
5+
## 1. Check current state
6+
7+
From the repo root (`chrome-devtools-mcp`):
8+
9+
```powershell
10+
# Auth (one-time or if needed)
11+
gh auth status
12+
13+
# Current branch and status
14+
git branch -a
15+
git status
16+
17+
# Open PRs targeting main (your fork)
18+
gh pr list --repo omalleyandy/chrome-devtools-mcp --state open --base main
19+
```
20+
21+
- If you have **uncommitted changes**: commit or stash first.
22+
- If you have **open PRs** you want to merge: use the steps in **Merge open PRs** below.
23+
24+
## 2. Sync main with remote
25+
26+
Get latest from **origin** (your fork) and keep local main in sync:
27+
28+
```powershell
29+
git switch main
30+
git pull origin main
31+
git push origin main
32+
```
33+
34+
If you also track **upstream** (ChromeDevTools/chrome-devtools-mcp) and want to bring in their latest:
35+
36+
```powershell
37+
git fetch upstream
38+
git switch main
39+
git merge upstream/main
40+
# Resolve conflicts if any, then:
41+
git push origin main
42+
```
43+
44+
## 3. Merge open PRs into main
45+
46+
For each PR you want to land:
47+
48+
```powershell
49+
# 1. Clean main
50+
git switch main
51+
git pull origin main
52+
53+
# 2. Merge the PR (from GitHub; replace 123 with PR number)
54+
gh pr merge 123 --squash
55+
# Or: gh pr merge 123 --rebase (to keep linear history)
56+
57+
# 3. Pull the updated main locally
58+
git pull origin main
59+
```
60+
61+
Or merge via a temporary integration branch (see [PR Landing Mode](https://cli.github.com/manual/) in the GitHub skill):
62+
63+
```powershell
64+
git switch main
65+
git pull origin main
66+
git switch -c integrate-pr-123
67+
gh pr checkout 123
68+
git switch integrate-pr-123
69+
git merge --squash <pr-branch-name>
70+
# ... fix/changelog, then:
71+
git switch main
72+
git merge integrate-pr-123
73+
git push origin main
74+
git branch -d integrate-pr-123
75+
```
76+
77+
## 4. Final sync check
78+
79+
```powershell
80+
git switch main
81+
git pull origin main
82+
git status
83+
git log -1 --oneline
84+
```
85+
86+
- `git status` should be clean (or only show intended changes).
87+
- Your latest commit should match what you see on GitHub for `main`.
88+
89+
## Quick one-liner (main only, no PR merge)
90+
91+
If you only want to **update local main from origin** and **push any local main commits**:
92+
93+
```powershell
94+
git switch main && git pull origin main --rebase && git push origin main
95+
```
96+
97+
## Remotes (this repo)
98+
99+
- **origin**: `git@github.com:omalleyandy/chrome-devtools-mcp.git` (your fork)
100+
- **upstream**: `https://github.com/ChromeDevTools/chrome-devtools-mcp.git` (upstream)
101+
102+
All merge/sync steps above use **origin**; add **upstream** only when you want to pull from ChromeDevTools.

scripts/github-sync-main.ps1

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# GitHub: check state and sync main with origin
2+
# Run from repo root: .\scripts\github-sync-main.ps1
3+
# Optional: .\scripts\github-sync-main.ps1 -Sync to also pull and push main
4+
5+
param(
6+
[switch]$Sync # If set, run git pull and push on main
7+
)
8+
9+
$ErrorActionPreference = "Stop"
10+
$repoRoot = (Get-Item $PSScriptRoot).Parent.FullName
11+
Set-Location $repoRoot
12+
13+
$logPath = Join-Path $repoRoot "github-sync-report.txt"
14+
$out = @()
15+
$out += "Repo: $repoRoot"
16+
$out += ""
17+
$out += "=== Branch ==="
18+
$out += (git branch --show-current 2>&1)
19+
$out += ""
20+
$out += "=== Status ==="
21+
$out += (git status --short 2>&1)
22+
$out += ""
23+
$out += "=== Remote branches ==="
24+
$out += (git branch -a 2>&1)
25+
$out += ""
26+
$out += "=== Open PRs (origin main) ==="
27+
$out += (gh pr list --repo omalleyandy/chrome-devtools-mcp --state open --base main 2>&1)
28+
$out += ""
29+
30+
if ($Sync) {
31+
$out += "=== Syncing main ==="
32+
git switch main 2>&1 | ForEach-Object { $out += $_ }
33+
git pull origin main --rebase 2>&1 | ForEach-Object { $out += $_ }
34+
git push origin main 2>&1 | ForEach-Object { $out += $_ }
35+
$out += "Done."
36+
} else {
37+
$out += "To sync main (pull + push), run: .\scripts\github-sync-main.ps1 -Sync"
38+
}
39+
40+
$text = $out -join "`r`n"
41+
$text | Out-File -FilePath $logPath -Encoding utf8
42+
Write-Host $text

0 commit comments

Comments
 (0)