What is the benefit of branching from upstream/HEAD?

Branching directly from the upstream remote HEAD ensures your work starts from the absolute latest code in the original project, even if your local default branch is currently outdated.

Why shouldn't I commit directly to my fork's main branch?

Keeping your fork's default branch a clean mirror of the upstream repository prevents history divergence and ensures that every new feature branch starts from a pristine state.

When should I use git rebase instead of git merge?

You should use rebase on your feature branches before submitting a PR to keep the project history linear and clean. Use merge when bringing upstream changes into your fork's default branch to avoid rewriting shared history.

How do I safely update a PR that is already under review?

Perform a git fetch and rebase onto the upstream default branch, then use git push --force-with-lease. This ensures you don't accidentally overwrite changes if someone else has pushed to your branch.

Forked Repo Git Practices

Name: Forked Repo Git Practices
Author: didmar

bydidmar

0•

开发者工具

Standardizes the workflow for maintaining forked repositories and contributing to open-source projects via Git.

This skill provides comprehensive guidance for developers working with forked Git repositories, ensuring a clean and efficient workflow when contributing to upstream projects. It covers essential tasks such as syncing with original repositories without merge conflicts, implementing standardized branch naming conventions, and managing complex local integration branches for testing multiple pending pull requests simultaneously. By following these established patterns, developers can avoid common pitfalls like branch divergence and messy commit histories.

主要功能

01Standardized branch naming conventions for features, bug fixes, and documentation.

02Comprehensive troubleshooting for common Git pitfalls in collaborative environments.

03Strategies for maintaining local integration branches to test multiple features together.

040 GitHub stars

05Step-by-step guidance for syncing forks with upstream HEAD to avoid divergence.

06Optimized PR submission workflow utilizing rebase and force-with-lease safety.

使用场景

01Contributing to open-source projects via GitHub or GitLab fork-and-pull-request workflows.

02Keeping a personal fork up-to-date with a fast-moving upstream repository.

03Managing complex local development environments where multiple pending features must coexist.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add didmar/skills forked-repo-git-practices

For use in Claude.ai and ChatGPT

主要功能

01Standardized branch naming conventions for features, bug fixes, and documentation.

02Comprehensive troubleshooting for common Git pitfalls in collaborative environments.

03Strategies for maintaining local integration branches to test multiple features together.

040 GitHub stars

05Step-by-step guidance for syncing forks with upstream HEAD to avoid divergence.

06Optimized PR submission workflow utilizing rebase and force-with-lease safety.

使用场景

01Contributing to open-source projects via GitHub or GitLab fork-and-pull-request workflows.

02Keeping a personal fork up-to-date with a fast-moving upstream repository.

03Managing complex local development environments where multiple pending features must coexist.