Skip to main content

Conflict Resolution

Conflicts occur when both the Make repo and target repo have changes that haven't been synced.

Detecting Conflicts​

GitFig shows a conflict warning when:

  • Make repo has new commits since last sync
  • Target repo also has new commits since last sync

Conflict Warning

Resolving Conflicts​

Option 1: View Changes First​

Click "Compare changes" to see what's different:

  • View Make repo changes
  • View target repo changes
  • Decide which direction to sync

Option 2: Sync Anyway​

If you're confident your changes should win:

  1. Click "Sync Anyway"
  2. Your Make changes overwrite target changes
  3. External target changes may be lost

Option 3: Pull First​

If target repo changes are important:

  1. Use Reverse Sync to pull target → Make
  2. Refresh Figma Make
  3. Make any needed adjustments
  4. Push from Make again

Preventing Conflicts​

  • Sync frequently to avoid drift
  • Use webhooks for auto-sync
  • Coordinate with team on who makes target repo changes
  • Use PR strategy for better visibility

Merge Conflicts in Git​

If Git can't auto-merge, you may need to resolve manually on GitHub:

  1. Check the PR for merge conflicts
  2. Resolve conflicts in GitHub's editor or locally
  3. Complete the merge