本地Git服务器创建Pull Request及远程合并分支的方法

Hey Michael, great questions—setting up a self-hosted Git server gives you full control over your code, so it’s totally worth sorting out these workflow gaps. Let’s break down your questions clearly:

1. Pull Requests (PRs) on a GUI-less self-hosted Git server #

a. Creating PR-like requests without a GUI #

First off, raw Git doesn’t have a native "Pull Request" feature—PRs are a collaboration layer added by platforms like GitHub or GitLab. For a bare, GUI-less server, you can use Git’s built-in git request-pull tool to generate a formal merge request that you can share with your team.

Here’s how it works:

1. Push your feature branch to the server first:

   git push origin feature/my-new-feature
   

2. Generate a pull request message that compares your branch against the target (usually master or main):

   git request-pull origin/master origin/feature/my-new-feature
   

This command outputs a formatted text block with commit history, diff summaries, and instructions for the repo maintainer to pull your changes. You can copy this text and send it via email, Slack, or your team’s communication tool—it acts as a text-based PR for review.

b. Is this a limitation of self-hosted Git servers? #

Not exactly. A bare Git repo (the kind you’d set up for a basic server) is just storage for version history—it doesn’t include collaboration tools like PRs, code review, or issue tracking. This isn’t a flaw in self-hosted Git; it’s just that raw Git is a version control system, not a full collaboration platform.

c. Can you set up a GitHub-like local website? #

Absolutely! There are tons of open-source, self-hosted tools that replicate GitHub’s core features (including PRs, which most call Merge Requests):

• GitLab Community Edition: A full-featured option with Merge Requests, CI/CD, user management, and a polished web UI—free to deploy locally.
• Gitea: Lightweight and resource-friendly, perfect for small teams or personal use. It includes Merge Requests, code review, and issue tracking with a GitHub-like interface.
• Gogs: Similar to Gitea, focused on simplicity and low resource usage, with all essential collaboration features.
  These tools run on your local server, giving you a full GUI for PRs, merging, and team collaboration—just like GitHub, but under your control.

2. Remote code merging without a GUI #

a. Merging when direct pushes to master are restricted #

If your team blocks direct pushes to master, the standard command-line workflow looks like this:

1. Update your local master to match the server:

   git checkout master
   git pull origin master
   

2. Merge the latest master into your feature branch to resolve conflicts locally:

   git checkout feature/my-new-feature
   git merge master
   # Resolve any conflicts, then commit the merge
   git add .
   git commit -m "Merge master into feature/my-new-feature"
   

3. Push your updated feature branch back to the server:

   git push origin feature/my-new-feature
   

4. Use git request-pull (as above) to send a merge request to the master maintainer. They’ll review your changes, merge the feature branch into master locally, and push the updated master to the server.

b. Command-line way to trigger remote merging (if you have permission) #

If you have permission to merge into master but want to avoid a GUI, raw bare repos don’t support server-side merging (since they have no working directory to resolve conflicts). However, if you use a self-hosted platform like GitLab or Gitea, they offer command-line tools to trigger remote merges:

• For GitLab, use the glab CLI tool:

  # Create a Merge Request from your feature branch to master
  glab mr create --source feature/my-new-feature --target master --title "Add user authentication" --description "Fixes login bug #123"
  # Merge the MR once it’s approved
  glab mr merge <your-mr-number>
  

This lets you create and merge requests entirely from the command line, no GUI needed.

内容的提问来源于stack exchange，提问作者Michael