Ruby on Rails项目远程协作及Git版本控制问题咨询

Hey there! Let's walk through exactly how to get your Ruby on Rails project set up for private collaboration with your teammate—no paid services required. I'll cover both free managed options and self-hosting, plus the Git workflow and RubyMine tricks to keep things smooth.

First, you need a place to host your private code without paying. Here are two solid options:

Option A: Free Managed Private Repos #

These are zero-hassle and perfect for small teams:

• GitLab Free: Lets you create unlimited private repos with up to 5 collaborators, no credit card needed. It has built-in code review, issue tracking, and CI/CD tools.
• Gitea: A lightweight, open-source Git platform. You can use free public instances (like gitea.com's free tier) or host it yourself if you want full control.

Option B: Self-Host Your Own Git Server #

If you have a spare VPS, old laptop, or even a Raspberry Pi, you can set up a bare Git repo in minutes:

• On your server, create a dedicated Git user and initialize the repo:

  sudo adduser git
  su git
  mkdir my-rails-project.git && cd my-rails-project.git
  git init --bare
  

• Back on your local machine, link your project to this remote:

  git remote add origin git@your-server-ip:/home/git/my-rails-project.git
  

• Share your server's SSH key with your teammate so they can access it securely (no passwords required!).

This simple workflow will eliminate most version control confusion with your collaborator:

• Protect the main branch: Keep main (or master) as your stable, production-ready branch. Never commit directly to it.
• Use feature branches for every change: For new features, bug fixes, or even small tweaks, create a separate branch (e.g., add-user-login, fix-cart-checkout-bug):

  # Create and switch to a new branch
  git checkout -b feature/your-feature-name
  # Push the branch to the remote for your teammate to see
  git push -u origin feature/your-feature-name
  

• Code reviews first: When your feature is done, ask your teammate to review it via a Pull Request (PR) or Merge Request (MR)—GitLab/Gitea have built-in tools for this. If self-hosting, you can share the branch link and discuss changes before merging.
• Sync regularly to avoid conflicts: Always pull the latest main into your feature branch before submitting a PR:

  git checkout main
  git pull origin main
  git checkout feature/your-feature-name
  git merge main
  

• Merge only after approval: Once your teammate signs off, merge the feature branch into main, then delete the feature branch locally and remotely.

Since you're using RubyMine, these steps will make your workflow faster:

• Add the remote repo: Go to VCS > Git > Remotes, click the + button, paste your remote URL (e.g., git@gitlab.com:your-username/your-project.git), and name it origin.
• Create a feature branch: Right-click your project root > Git > New Branch, enter your branch name, and check "Checkout branch" to switch to it immediately.
• Push changes: After committing your work, click the push icon in the top toolbar (or go to VCS > Git > Push). RubyMine will auto-track the remote branch if it's your first push.
• Pull latest updates: Click the pull icon, or go to VCS > Git > Pull. Make sure to select main to sync the latest stable code.
• Resolve conflicts: If you hit merge conflicts, RubyMine will open a side-by-side resolution tool. Just pick which code to keep, save the file, and commit the fix.

• Commit small and often: Small, focused commits (e.g., "Add user model validations" instead of "Fix stuff") make reviews easier and rollbacks simpler.
• Write clear commit messages: Explain what you changed and why—this helps your teammate understand your work at a glance.
• Use SSH keys instead of passwords: For any Git host, set up SSH keys in RubyMine via File > Settings > Version Control > Git > SSH Executable—it's more secure and saves you from re-entering credentials constantly.
• Test before merging: Always run your Rails tests (rails test or rspec) on your feature branch before submitting a PR to avoid breaking the stable main branch.

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