agentleFS
Sign inStart free
OpenClawAndroidOpenClawAndroid/openclaw-android-assistant/openclaw-android/AGENTS.md

openclaw-android-assistant / openclaw-android

AGENTS.md556 starsChanged 34 days agoMITView on GitHub

When merging a worktree branch into main and conflicts arise:

1 other project uses a version of this.

Adopted by

Most recently taken up by

The file

We split this AGENTS.md into the rules it gives an agent

10 rules. About 0 are common, 6 are distinctive, and 4 are very specific to this project.

  • ≈0

    Common · estimate

    Many files like this have a rule of this kind.

  • ≈6

    Distinctive · estimate

    This author's own choices. Worth a look.

  • 4

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  1. Very specific:

    If working in detached HEAD, commit there first.

    line 5
  2. Distinctive:

    When merging a worktree branch into main and conflicts arise:

    line 10
  3. Very specific:

    Run git merge <branch> --no-commit from the main worktree (/Users/igor/Git-projects/codex-web-local).

    line 12
  4. Very specific:

    Do not blindly --ours or --theirs — manually combine both sides.

    line 15
  5. Very specific:

    After fixing, git add <file> and git commit.

    line 16
  6. Distinctive:

    Always create a commit after completing each discrete task or sub-task.

    line 21
  7. Distinctive:

    Do not batch multiple tasks into a single commit.

    line 22
  8. Distinctive:

    After completing a task that changes behavior or UI, always run a Playwright verification in headless mode.

    line 27
  9. Distinctive:

    Before taking any screenshot, wait a few seconds to ensure the UI has fully loaded.

    line 28
  10. Distinctive:

    Always capture a screenshot of the changed result and display that screenshot in chat when reporting completion.

    line 29

≈ “Common” is an estimate: at least 1 in 5 of the 40,246 AGENTS.md files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
AGENTS.md

AGENTS.md

Detached HEAD: Merge To Local main Without Creating A Branch

  • If working in detached HEAD, commit there first.
  • Then apply that commit onto local main from the main worktree using fast-forward merge or cherry-pick.

Merging Worktree Branch to Main With Conflicts

When merging a worktree branch into main and conflicts arise:

  1. Run git merge <branch> --no-commit from the main worktree (/Users/igor/Git-projects/codex-web-local).
  2. Identify conflicted files with git diff --name-only --diff-filter=U.
  3. For each conflicted file, resolve using a Python script that replaces the conflict markers (<<<<<<<, =======, >>>>>>>) with the correctly merged content — keeping changes from both sides.
  4. Do not blindly --ours or --theirs — manually combine both sides.
  5. After fixing, git add <file> and git commit.
  6. Note: the worktree workspace (zpw/) is restricted — StrReplace tool cannot edit files in the main worktree. Use Shell or a Python script instead.

Commit After Each Task

  • Always create a commit after completing each discrete task or sub-task.
  • Do not batch multiple tasks into a single commit.
  • Each commit message should describe the specific change made.

Completion Verification Requirement

  • After completing a task that changes behavior or UI, always run a Playwright verification in headless mode.
  • Before taking any screenshot, wait a few seconds to ensure the UI has fully loaded.
  • Always capture a screenshot of the changed result and display that screenshot in chat when reporting completion.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free