如何防止未拉取最新代码时强制推送覆盖GitHub远程仓库变更？

Great question—this is a common pain point in collaborative Git workflows, but there are solid ways to lock down your repo and clients to avoid these accidental overwrites. Here's a breakdown of solutions, from remote repo enforcement to client-side settings:

GitHub Repository Settings (Enforce at the Source) #

The most reliable way to stop unwanted force pushes is to enforce rules directly on your GitHub repository. This works regardless of which Git client your team uses, since GitHub will block the push before it even hits the remote.

Set Up Protected Branches #

1. Go to your GitHub repository → Settings → Branches.
2. Click Add rule to create a new branch protection rule.
3. Enter the branch name pattern you want to protect (e.g., main, develop, or release/* for all release branches).
4. Check the box labeled "Prevent force pushes"—this will block any force push attempts to the protected branch, even if someone tries it from their client.
5. Optional but highly recommended:
   • Check "Require pull request reviews before merging" to ensure changes are reviewed before being merged into critical branches.
   • Check "Require status checks to pass before merging" (if you use CI/CD tools) to ensure code passes tests before being pushed.
6. Save the rule.

With this in place, GitHub will reject any force push to the protected branch, so even if a developer tries to force push, they'll get an error message explaining why it's blocked.

Git Client Configurations (TortoiseGit & EGit) #

Even with remote protections, it's good to configure your team's clients to prevent accidental force pushes by default.

TortoiseGit #

• Disable force push by default:
  1. Open TortoiseGit → Settings → Git → Push.
  2. Uncheck the box for "Allow force push" (exact wording may vary by version). This removes the option to force push unless you explicitly enable it in the push dialog.
• Enable pull before push:
  1. In the same Push settings, look for an option like "Pull before push" and check it. This ensures your local branch is synced with the remote before pushing, eliminating the need for a force push in most cases.

EGit (Eclipse) #

• Block force pushes by default:
  1. Open Eclipse → Window → Preferences → Team → Git → Push.
  2. Under the "Force push" dropdown, select "Never". This will prevent EGit from allowing force pushes unless you manually override it in the push wizard.
• Adopt a pull-first workflow:
  While EGit doesn't have a built-in "pull before push" toggle, get into the habit of running git pull (or using the Pull button in Eclipse's Git perspective) before starting work on any files, and again before pushing your changes. This keeps your local repo in sync with the remote.

Additional Best Practices #

Beyond settings, these habits will reduce conflicts and accidental overwrites:

• Always pull latest changes first: Make git pull the first thing you do when starting your workday or switching to a new task.
• Use feature branches: Instead of working directly on main or develop, create a dedicated branch for each feature/bug fix. This isolates your changes and makes merging easier.
• Communicate with your team: If you're working on a file that someone else might be editing, mention it in your team chat or project management tool. This avoids overlapping work that leads to conflicts.
• Only force push when necessary: Force pushes should be reserved for cleaning up local commits (like squashing or rewording) that haven't been pushed to the remote yet. Never force push over changes that other team members have already pushed.

Content of the question comes from Stack Exchange, question author user2856028