Run any Skill in Manus with one click

pull

Stars9

Forks0

UpdatedMay 24, 2026 at 11:30

Pull latest origin/main into the current branch and resolve merge conflicts. Use when Codex needs to sync a feature branch with origin before pushing.

Installation

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

Run Skill in Manus

Source

kwanpham2195

kwanpham2195/symphony-go

View GitHub Repository View Creator Repositories

Download

Run Skill in Manus

Related occupationsSOC

Based on SOC occupation classification

Software DevelopersComputer and Mathematical Occupations·SOC 15-1252

SKILL.md

readonly

name	pull
description	Pull latest origin/main into the current branch and resolve merge conflicts. Use when Codex needs to sync a feature branch with origin before pushing.

Pull

Steps

Verify git status is clean (or commit/stash first).

Enable rerere:

git config rerere.enabled true
git config rerere.autoupdate true

Fetch latest refs:
```
git fetch origin
```

Sync remote feature branch first:

git pull --ff-only origin $(git branch --show-current)

Merge main:

git -c merge.conflictstyle=zdiff3 merge origin/main

If conflicts, resolve them (see guidance below), then:
```
git add <files>
git merge --continue
```
Run validation:
```
make check
```
Summarize: call out challenging conflicts and how they were resolved.

Conflict Resolution

Inspect before editing: git status, git diff, git diff --merge.
With zdiff3, conflict markers include base (|||||||), ours (<<<<<<<), theirs (>>>>>>>).
Summarize the intent of both changes. Decide the correct outcome. Then edit.
Prefer minimal, intention-preserving edits.
Resolve one file at a time. Run tests after each batch.
Use ours/theirs only when certain one side should win entirely.
After resolving, verify no markers remain: git diff --check.
For generated files: resolve source first, then regenerate.
For import conflicts: accept both, then let lint/typecheck remove unused.

When to Ask

Only ask the user when:

The resolution depends on product intent not inferable from code.
The conflict crosses an API surface or migration where choosing wrong breaks consumers.
Two mutually exclusive designs have equivalent merit and no clear local signal.

Otherwise, proceed, document the decision in the commit, and leave reviewable history.

More from this repository

same repository

commit

kwanpham2195/symphony-go

Create a well-formed git commit from current changes using session history for rationale and summary; use when asked to commit, prepare a commit message, or finalize staged work.

2026-05-249

debug

kwanpham2195/symphony-go

Investigate stuck runs and execution failures by tracing Symphony logs with issue/session identifiers; use when runs stall, retry repeatedly, or fail unexpectedly.

2026-05-249

land

kwanpham2195/symphony-go

Land a PR by monitoring conflicts, resolving them, waiting for checks, and squash-merging when green; use when asked to land, merge, or shepherd a PR to completion.

2026-05-249

linear

kwanpham2195/symphony-go

Use Symphony's linear_graphql client tool for raw Linear GraphQL operations such as comment editing, state transitions, and uploads.

2026-05-249

push

kwanpham2195/symphony-go

Push current branch to origin and create or update the PR; use when asked to push, publish updates, or create a pull request.

2026-05-249

symphony

kwanpham2195/symphony-go

Set up, configure, run, and troubleshoot symphony-go — an autonomous agent orchestrator that polls Linear issues and runs Codex sessions. Use when the user asks to install symphony, create a WORKFLOW.md, configure Linear integration, start the orchestrator, debug stuck agents, fix failing hooks, tune retry/backoff, set up workspaces, or any task related to running symphony-go in a repository.

2026-05-249

name	pull
description	Pull latest origin/main into the current branch and resolve merge conflicts. Use when Codex needs to sync a feature branch with origin before pushing.

Pull

Steps

Verify git status is clean (or commit/stash first).

Enable rerere:

git config rerere.enabled true
git config rerere.autoupdate true

Fetch latest refs:
```
git fetch origin
```

Sync remote feature branch first:

git pull --ff-only origin $(git branch --show-current)

Merge main:

git -c merge.conflictstyle=zdiff3 merge origin/main

If conflicts, resolve them (see guidance below), then:
```
git add <files>
git merge --continue
```
Run validation:
```
make check
```
Summarize: call out challenging conflicts and how they were resolved.

Conflict Resolution

Inspect before editing: git status, git diff, git diff --merge.
With zdiff3, conflict markers include base (|||||||), ours (<<<<<<<), theirs (>>>>>>>).
Summarize the intent of both changes. Decide the correct outcome. Then edit.
Prefer minimal, intention-preserving edits.
Resolve one file at a time. Run tests after each batch.
Use ours/theirs only when certain one side should win entirely.
After resolving, verify no markers remain: git diff --check.
For generated files: resolve source first, then regenerate.
For import conflicts: accept both, then let lint/typecheck remove unused.

When to Ask

Only ask the user when:

The resolution depends on product intent not inferable from code.
The conflict crosses an API surface or migration where choosing wrong breaks consumers.
Two mutually exclusive designs have equivalent merit and no clear local signal.

Otherwise, proceed, document the decision in the commit, and leave reviewable history.