DEV Community

Deep Fix
Deep Fix

Posted on

Fix Git Merge Conflicts in CI/CD Pipelines – Best Practices & Automation

#git #ci #devops #automation

Fix Git Merge Conflicts in CI/CD Pipelines – Best Practices & Automation

Merging code in a continuous integration/continuous deployment (CI/CD) environment can be tricky. A stray merge conflict can break a pipeline, stall releases, and frustrate teams. In this post we’ll walk through why merge conflicts happen in CI, how to detect and resolve them automatically, and provide a ready‑to‑use script you can drop into any pipeline.

Table of Contents

  1. Understanding the CI Merge Flow
  2. Detecting Conflicts Early
  3. Automatic Conflict Resolution Strategies
  4. Step‑by‑Step Implementation
  5. Putting It All Together – Sample Pipeline
  6. Resources & Downloadable Tools

Understanding the CI Merge Flow

When a pull request (PR) is merged, most CI systems checkout the target branch, pull the latest changes, and then run the build. If the PR was merged outside the CI (e.g., directly in GitHub UI) while another developer pushed new commits to the target branch, the CI job may end up checking out a commit that no longer fast‑forwards, leading to a merge conflict at the checkout step.

Typical failure message:

error: Your local changes to the following files would be overwritten by merge:
    src/app.js
Please commit your changes or stash them before you merge.
Enter fullscreen mode Exit fullscreen mode

Detecting Conflicts Early

The most reliable way to catch a conflict is before the heavy build steps run. Add a lightweight Git command at the start of the job:

# Exit with status 0 if merge succeeds, 1 if there are conflicts
git fetch origin $TARGET_BRANCH
git merge --no-commit --no-ff origin/$TARGET_BRANCH || {
  echo "::error ::Merge conflict detected between $CI_COMMIT_SHA and $TARGET_BRANCH"
  exit 1
}
Enter fullscreen mode Exit fullscreen mode

If the merge fails, the pipeline aborts early, saving compute time.

Automatic Conflict Resolution Strategies

  1. Prefer Target Branch (ours) – When the target branch is the source of truth.
  2. Prefer Feature Branch (theirs) – Useful for hot‑fixes.
  3. Custom Script – Run a formatter or a language‑specific tool to auto‑resolve trivial conflicts.

Below is a compact Bash helper that you can embed directly in your CI job:

#!/usr/bin/env bash
set -euo pipefail

TARGET_BRANCH=${1:-main}
STRATEGY=${2:-ours}   # "ours" or "theirs"

# Fetch and attempt merge
git fetch origin "$TARGET_BRANCH"
if ! git merge --no-commit --no-ff "origin/$TARGET_BRANCH"; then
  echo "Conflict detected – applying $STRATEGY strategy"
  if [[ "$STRATEGY" == "ours" ]]; then
    git checkout --ours .
  else
    git checkout --theirs .
  fi
  git add -u
  git commit -m "Auto‑resolved merge conflict using $STRATEGY strategy"
else
  echo "No conflicts – merge succeeded"
fi
Enter fullscreen mode Exit fullscreen mode

Save this as ci-resolve-conflict.sh, make it executable, and call it from your pipeline.

Step‑by‑Step Implementation

  1. Add the script to your repo (e.g., scripts/ci-resolve-conflict.sh).
  2. Make it executable – chmod +x scripts/ci-resolve-conflict.sh.
  3. Update the pipeline definition to run the script before any heavy jobs.
  4. Fail the pipeline if the script exits with a non‑zero code (meaning the conflict could not be auto‑resolved).
  5. Notify the team – use Slack, Teams, or GitHub status checks to alert developers.

Sample Pipeline (GitHub Actions) 

# .github/workflows/ci.yml
name: CI
on:
  push:
    branches: [ main ]
  pull_request:
    branches: [ main ]

jobs:
  build:
    runs-on: ubuntu-latest
    env:
      TARGET_BRANCH: main
    steps:
      - uses: actions/checkout@v3
        with:
          fetch-depth: 0   # needed for merge base
      - name: Install Bash utilities
        run: sudo apt-get update && sudo apt-get install -y git
      - name: Resolve merge conflicts automatically
        run: |
          chmod +x scripts/ci-resolve-conflict.sh
          ./scripts/ci-resolve-conflict.sh $TARGET_BRANCH ours
      - name: Run tests
        run: |
          echo "Running unit tests..."
          # your test command here
Enter fullscreen mode Exit fullscreen mode

If a conflict occurs, the script will attempt an ours resolution, commit the fix, and the pipeline continues to the test stage.

Resources & Downloadable Tools

Implementing these steps will make your CI/CD pipelines resilient to merge conflicts, keep your builds green, and free developers from manual conflict firefighting.

Happy merging!

Top comments (0)