---
title: "Git 103"
slug: "git-103-merge-conflicts"
description: "Get an introduction to merge conflicts, how to avoid them, and how to fix them."
updated: 2024-03-26T03:02:58Z
published: 2024-03-26T03:02:58Z
canonical: "learn.allspice.io/git-103-merge-conflicts"
---

> ## Documentation Index
> Fetch the complete documentation index at: https://learn.allspice.io/llms.txt
> Use this file to discover all available pages before exploring further.

# Git 103 -  Merge conflicts

## Git 103: Merge conflicts

Merge conflicts happen when two different people make changes to files on either the same branch, or different branches. When they go to merge, there will be a merge conflict.

### Avoiding merge conflicts

The best way to deal with merge conflicts is by prevention. - Set up branch protection on main - Separate schematics into multiple files - Communicate when working on single files like the PCB - Use LFS to lock files

### Fixing merge conflicts

Although we're building a merge engine, for now, the best way to fix a merge conflict is to view the file changes in AllSpice and manually copy the changes to the new file.