Auto Git Cherry Picker with WMT (Jira) and VCS (GitLab) integrations

A language-agnostic package for automated Git cherry-picking with WMT (Work Management Tool – Jira) and VCS (Version Control System – GitLab) integrations for team workflows. It is useful for backporting changes to multiple branches, cloning fixes, or propagating features to separate projects. It is especially valuable for teams that perform a large number of manual cherry-picks.

This package streamlines the cherry-picking process across branches by automatically creating merge requests getting necessary data from WMT (Jira) ticket data.

Currently, it operates as a CLI UI for developers, but it can be easily adapted to run as a standalone server-based automation service.

How it works (diagram)

Features

• Automated git cherry-pick workflow
• WMT (Work Management Tool) - fetches ticket details automatically (Jira)
• VCS (Version Control System) - creates merge requests with assignees and reviewers (GitLab)
• Interactive CLI mode with beautiful prompts
• Language-agnostic - works as a standalone package with any programming language
• Configurable via .env file

Requirements

• PHP, composer

Installation

Please read QUICKSTART.md

What Happens During Execution?

1. Preparation

   • (Optional - turned off by default), Configures locally git user-name/email, remote origin
   • Stashes current changes

2. WMT (Jira) operations

   • It gets using Jira API necessary data from Issue data: fix_version (e.g. 2.0.0, 2.0.5) ; feature or bug (from IssueType) ; summary (aka title)

3. VCS (Gitlab) Branch Operations

   • GitLab Project is defined by getting projectId from Gitlab by groupName and projectName. For example if Gitlab group is core and projectName is platform it will be: core/platform. You can see group and projectName from URL of your current Gitlab project: https://gitlab.your.domain/core/platform
   • Pulls latest from target branch (by template: release/fix_version or hotfix/fix_version automatically according to fix_version) to local git
   • Creates new branch for cherry-pick from target branch (by template: feature/ticket-number or bugfix/ticket-number according to data from WMT )

4. Cherry-Pick

   • Applies commits with -x flag (preserves original commit reference)
   • Detects conflicts automatically

5. Conflict Resolution (if needed)

   • Tool pauses and shows conflict message
   • You resolve conflicts in your editor, SAVE FILES BUT DON'T ADD TO STAGE OR COMMIT THEM !!!!
   • Press Enter to continue
   • Tool stages changes, commits and continues

6. Finalization

   • Pushes new branch to remote
   • Creates merge request in GitLab
   • Assigns reviewer and asignee automatically
   • Returns to original branch in your local computer's git
   • Cleans up local cherry-pick branch
   • Restores stashed changes

Directory Structure

cherry-picker/
├── bin/
│   └── cherry-picker          # Executable CLI script
├── src/
│   ├── CherryPicker.php       # Main orchestrator
│   ├── Container.php          # Dependency injection container
│   ├── Config/
│   │   └── ConfigLoader.php   # Configuration management
|   |     └── cherry-picker.php  # Default configuration
│   ├── Clients/
│   │   ├── JiraClient.php     # Jira API client
|   |   |      ...........................
│   ├── Contracts/
│   ├── DataTransferObjects/
├── env.example                 # Example configuration
└── composer.json               # Package definition

Main Dependencies

• guzzlehttp/guzzle - HTTP client for API requests
• symfony/process - Process execution
• laravel/prompts - Beautiful CLI prompts
• vlucas/phpdotenv - Environment variable loading
• php-di/php-di - Dependency injection container

Testing Pest PHP

Run tests in CLI (need to install dev dependencies with composer install --dev):

./vendor/bin/pest

---

Also check our Agent Chat UI Starter kit: https://agenytics.com

---

Changelog

Please see CHANGELOG for more information what has changed recently.

Contributing

Please see CONTRIBUTING for details.

Security

If you discover any security related issues, please email muhammadumarsotvoldiev@gmail.com instead of using the issue tracker.

Credits

• Muhammad Umar
• All Contributors

License

The MIT License (MIT). Please see License File for more information.

PHP Package Boilerplate

This package was generated using the PHP Package Boilerplate by Beyond Code.