git-workflow

The git-workflow skill provides a rigorous, standardized set of procedures for managing contributions to the community-patterns repository. It is designed specifically for software agents acting as contributors to a rapidly evolving project that relies on constant rebasing and systematic pull request management. By enforcing a strict sequence of operations—updating from main, rebasing branches, and utilizing Git's force-with-lease mechanism—the skill minimizes merge conflicts and ensures that all submitted patterns maintain a clean, linear commit history suitable for peer review. It automates the complex dance between local forks and upstream repositories, handling the intricacies of remote configuration, branch switching, and pull request metadata generation via the GitHub CLI.

• Automated synchronization with upstream repositories using fetch and rebase protocols to ensure local environments remain current.

• Integrated pull request creation workflow, including standardized templates for summaries, testing checklists, and feature descriptions.

• Strict enforcement of branch-based development for all contributions, preventing direct pushes to the main branch.

• Conflict resolution assistance that guides agents through interactive rebase stages, ensuring stability before submission.

• Context-aware remote management, distinguishing between personal forks and direct repository contributions based on workspace configuration files.

• Always verify current branch state using git status before committing work to prevent accidental inclusion of untracked files.

• Strictly adhere to the manual permission request requirement; never automatically create pull requests without explicit user authorization.

• Utilize force-with-lease for pushing feature branches to avoid overwriting remote work that has not yet been fetched.

• When rebasing, if conflicts arise, always document the resolution process and ensure the rebase continues correctly before attempting to push the updated branch.

• For development on the jkomoros/community-patterns upstream repo, always create a specific feature branch using the username/feature-name convention to facilitate clean PR tracking.

• Prioritize the use of rebasing over merging to maintain a clean project history, as per the community's strict development guidelines.