New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Skill Doli Upmerge

by Dolibarr in Dolibarr/dolibarr

Forward-port (upmerge) Dolibarr maintenance branches in cascade (n into n+1, up to develop) with dev/pullmerge.sh, and resolve merge conflicts without committing.

MITAuto-check passedDevelopment

Install Skill Doli Upmerge

skills CLI
$ npx skills add Dolibarr/dolibarr --skill skill-doli-upmerge -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install Dolibarr/dolibarr skill-doli-upmerge --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/Dolibarr/dolibarr.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/skill-doli-upmerge .claude/skills/skill-doli-upmerge && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
skill-doli-upmerge
GitHub stars
7.7k
Token cost
~674 tokens
SKILL.md length
335 words
Files
1
Skills in repo
8
Repo updated
First seen
Licence
MIT

At a glance

Forward-port (upmerge) Dolibarr maintenance branches in cascade (n into n+1, up to develop) with dev/pullmerge.sh, and resolve merge conflicts without committing.

  • Works in 4 steps: Run the script, from the parent… → As soon as the script fails, go into the… → Do not commit, do not git add, do not… → …
  • Asked to do an upmerge
  • SKILL.md covers Layout and Procedure
  • Calls git and php

What it does

Skill Doli Upmerge is an agent skill from Dolibarr/dolibarr. Forward-port (upmerge) Dolibarr maintenance branches in cascade (n into n+1, up to develop) with dev/pullmerge.sh, and resolve merge conflicts without committing. Use when asked to do an upmerge, a forward port, a cascade merge, or to run pullmerge.sh.

Its SKILL.md is about 670 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow. It works with Git and PHP. The repository describes itself as: Dolibarr ERP CRM is a modern software package to manage your company or foundation's activity (contacts, suppliers, invoices, orders, stocks, agenda, accounting, ...). it's an… The licence is MIT.

When your agent uses it

  • Asked to do an upmerge
  • A cascade merge
  • Run pullmerge.sh

Example prompts

  • “/skill-doli-upmerge”

Workflow steps

4 steps, taken from the first numbered list in SKILL.md.

  1. Run the script, from the parent directory, starting from the requested version (default 14)
  2. As soon as the script fails, go into the directory of the branch where the merge failed
  3. Do not commit, do not git add, do not push. Just report
  4. Once the user has committed and pushed the resolution, restart the cascade from that version

What it can do on your machine

Read from SKILL.md and the folder at commit ba91562. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git
    • php

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Skill Doli Upmerge loads about 674 tokens when it runs. Until then it costs about 68 tokens; SKILL.md has 335 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~68
When it runs · the whole SKILL.md, loaded when a task matches
~674

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from Dolibarr/dolibarr at commit ba91562, republished under its MIT licence (© Dolibarr). 335 words, ~674 tokens.

Download SKILL.mdSave it as .claude/skills/skill-doli-upmerge/SKILL.md (or your agent's skills folder).
name
skill-doli-upmerge
description
Forward-port (upmerge) Dolibarr maintenance branches in cascade (n into n+1, up to develop) with dev/pullmerge.sh, and resolve merge conflicts without committing. Use when asked to do an upmerge, a forward port, a cascade merge, or to run pullmerge.sh.
license
MIT
user-invocable
true

Upmerge / forward porting of Dolibarr branches

Layout

Each maintenance branch has its own local clone, in the same parent directory: dolibarr_14.0, dolibarr_15.0, ..., dolibarr_24.0 (one directory = one branch xx.0), plus dolibarr_dev for the branch develop.

The script dolibarr_dev/dev/pullmerge.sh must be run from this parent directory (it uses relative paths dolibarr_xx.0).

Procedure

  1. Run the script, from the parent directory, starting from the requested version (default 14):

    bash
    ./dolibarr_dev/dev/pullmerge.sh all 14
    • all: pull the last version of each branch (each directory), then merge each version n into n+1, then the last one into develop.
    • pull or merge alone can be used. merge 16 restarts the cascade from 16 into 17.
    • On a successful merge, the script pushes automatically. This is expected behaviour.

  2. As soon as the script fails, go into the directory of the branch where the merge failed (the one named in ERROR : Conflict or error on merge into dolibarr_xx.0) and try to resolve the conflicts:

    • git status / git diff to list conflicted files.
    • Understand the intent of the change coming from the previous branch (often a fix, sometimes a security fix) and keep it, while keeping the changes specific to the current branch (refactoring such as $user->hasRight(), new hooks, new variables...).
    • Also check files that git merged automatically when the fix touches the same logic (for example: no duplicated or misplaced restrictedArea() call left before the object fetch).
    • Check there is no conflict marker left and run php -l on each resolved file.

  3. Do not commit, do not git add, do not push. Just report:

    • that the conflict has been resolved, with a short summary per file of the choice made,
    • or that the resolution of a conflict is a problem (ambiguous intent, functional choice needed...), and why.

  4. Once the user has committed and pushed the resolution, restart the cascade from that version:

    bash
    ./dolibarr_dev/dev/pullmerge.sh merge <version where it failed>

    Before restarting, check with git status / git log in the directory that the merge commit exists and was pushed. Then repeat step 2 on the next failure, until the script ends with Success !.

© Dolibarr, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .agents/skills/skill-doli-upmerge of Dolibarr/dolibarr.

Open the folder on GitHubat commit ba91562

Compare with similar skills

Skill Doli Upmerge next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Skill Doli Upmerge compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Skill Doli Upmerge this skillDolibarr/dolibarr7.7k—~674Automated safety check: PassMIT
Chamilo Changelog Updaterchamilo/chamilo-lms1k—~4.2kAutomated safety check: PassGPL-3.0
Agentsop Aideragentsope/SkillAlchemy436—~3.5kAutomated safety check: PassMIT
Dora Metricsathola/claude-night-market341—~1.2kAutomated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT

Similar skills

  • Chamilo Changelog Updater

    chamilo/chamilo-lms

    Adds commits for a new Chamilo release to the changelog page, classifying them into categories and skipping those already listed for that version.

    1k GitHub stars~4.2k tokensUpdated today
    DevelopmentAuto-check passed

  • Agentsop Aider

    agentsope/SkillAlchemy

    SOP for terminal-based, git-native AI pair programming with Aider (git work-tree + tree-sitter repo-map + edit-format + human-in-loop REPL).

    436 GitHub stars~3.5k tokensUpdated 2 days ago
    DevelopmentAuto-check passed

  • Dora Metrics

    athola/claude-night-market

    Computes DORA delivery-performance metrics from git and GitHub API.

    341 GitHub stars~1.2k tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Contributor-First PR Merge

    HKUDS/OpenHarness

    Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • Migrate Internal Package into Ghost

    TryGhost/Ghost

    Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.

    56k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed

More from Dolibarr/dolibarr

All 9 skills in this repo

  • Skill Doli Code Review

    Dolibarr/dolibarr

    Reviews Dolibarr PHP code for compliance with coding standards and security best practices, and fixes identified issues.

    7.7k GitHub starsUsed in 1 repo~1.1k tokens
    Auto-check passed

  • Skill Doli Devmodule

    Dolibarr/dolibarr

    A skill your agent uses when developing a Dolibarr ERP/CRM external module, working with database queries, or asking about Dolibarr best practices.

    7.7k GitHub starsUsed in 1 repo~3.3k tokens
    Auto-check passed

  • Skill Doli Test Phpunit

    Dolibarr/dolibarr

    Creates or modify PHP unit tests for Dolibarr ERP/CRM functions and methods.

    7.7k GitHub starsUsed in 1 repo~1.3k tokens
    Auto-check passed

  • Skill Doli Dev

    Dolibarr/dolibarr

    A skill your agent uses when developing Dolibarr ERP/CRM code, working with database queries, or asking about Dolibarr best practices.

    7.7k GitHub stars~2.9k tokensUpdated today
    Auto-check passed

  • Skill Doli Test Hurl

    Dolibarr/dolibarr

    Create and maintain Hurl tests for Dolibarr ERP/CRM. An agent skill from Dolibarr/dolibarr.

    7.7k GitHub stars~3.7k tokensUpdated today
    Auto-check passed

  • Skill GitHub

    Dolibarr/dolibarr

    Handles GitHub issues and pull requests of the project with the gh CLI - list, triage, analyze an issue, review a PR, diagnose a CI failure, comment, label, close or merge.

    7.7k GitHub stars~1.6k tokensUpdated today
    Auto-check passed

Works with

Categories

Questions about Skill Doli Upmerge

What does Skill Doli Upmerge do?

Forward-port (upmerge) Dolibarr maintenance branches in cascade (n into n+1, up to develop) with dev/pullmerge.sh, and resolve merge conflicts without committing. Skill Doli Upmerge is an agent skill from Dolibarr/dolibarr.sh, and resolve merge conflicts without committing.

When should I use Skill Doli Upmerge?

Skill Doli Upmerge fits situations like: asked to do an upmerge; A cascade merge; run pullmerge.sh.

How do I install Skill Doli Upmerge in Claude Code?

Run `npx skills add Dolibarr/dolibarr --skill skill-doli-upmerge -a claude-code`. Or copy the skill folder (.agents/skills/skill-doli-upmerge in Dolibarr/dolibarr) into .claude/skills/skill-doli-upmerge in your project. Claude Code loads it when a task matches its description.

How do I install Skill Doli Upmerge in Codex?

Run `npx skills add Dolibarr/dolibarr --skill skill-doli-upmerge -a codex`. Or copy the skill folder (.agents/skills/skill-doli-upmerge in Dolibarr/dolibarr) into .agents/skills/skill-doli-upmerge in your project. Codex loads it when a task matches its description.

Can I use Skill Doli Upmerge in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add Dolibarr/dolibarr --skill skill-doli-upmerge -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/skill-doli-upmerge, .gemini/skills/skill-doli-upmerge, .github/skills/skill-doli-upmerge and .opencode/skills/skill-doli-upmerge in your project.

What does Skill Doli Upmerge need to run?

Going by SKILL.md and its folder, Skill Doli Upmerge needs the command-line tools its instructions call (git and php).

Does Skill Doli Upmerge access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Skill Doli Upmerge safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Skill Doli Upmerge use?

Skill Doli Upmerge is published under the MIT licence (declared in SKILL.md). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Skill Doli Upmerge use?

About 674 tokens (SKILL.md is roughly 2.7k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Skill Doli Upmerge?

Skills that share tags, products or a category with Skill Doli Upmerge: Chamilo Changelog Updater (chamilo/chamilo-lms, 1k stars), Agentsop Aider (agentsope/SkillAlchemy, 436 stars), Dora Metrics (athola/claude-night-market, 341 stars) and Finishing a Development Branch (obra/superpowers, 297k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Skill Doli Upmerge?

Dolibarr (a GitHub organization) maintains it in Dolibarr/dolibarr, which has 7,712 GitHub stars. The repository holds 8 skills in this directory. The repository was last updated on October 11, 2026.

Source: Dolibarr/dolibarr on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.