Skip to main content
Version: 1.1.0

Merge Request Guide

Creating Merge Requests

Basic Steps

  1. Go to source branch
  2. Click "New Merge Request"
  3. Select target branch
  4. Fill in title and description
  5. Submit merge request

Reviewing Merge Requests

Code Review

  1. Review changed files
  2. Add inline comments
  3. Submit overall review comments
  4. Set review status

Merge Operation

  1. Ensure all checks pass
  2. Scroll below comments
  3. Find "Merge" button (below comments section)
  4. Choose merge method
    • Regular merge
    • Squash merge
    • Rebase merge

Merge Options Explained

Regular Merge

  • Preserves complete commit history
  • Creates merge commit
  • Suitable for feature branch merges

Squash Merge

  • Combines all commits into one
  • Keeps main branch history clean
  • Suitable for bug fix merges

Rebase Merge

  • Replays all commits
  • Creates linear history
  • Suitable for long-term maintenance branches

Best Practices

Before Submitting Merge Request

  1. Ensure local tests pass
  2. Update branch to latest
  3. Resolve conflicts
  4. Write clear description

Review Points

  1. Code quality
  2. Test coverage
  3. Documentation updates
  4. Performance impact

After Merge Operations

  1. Delete source branch
  2. Update related Issue status
  3. Deploy new version (if needed)
  4. Notify relevant personnel