result. Git hasn’t automatically created a new merge commit. It has paused the process while you resolve the conflict. If you want to see which files are unmerged at any point after a merge conflict, you conflict-resolution markers to the files that have conflicts, so you can open them manually and resolve those conflicts. Your file contains a section that looks something like this: <<<<<<< HEAD:index in the bottom part. In order to resolve the conflict, you have to either choose one side or the other or merge the contents yourself. For instance, you might resolve this conflict by replacing the entire

result. Git hasn’t automatically created a new merge commit. It has paused the process while you resolve the conflict. If you want to see which files are unmerged at any point after a merge conflict, you conflict-resolution markers to the files that have conflicts, so you can open them manually and resolve those conflicts. Your file contains a section that looks something like this: <<<<<<< HEAD:index in the bottom part. In order to resolve the conflict, you have to either choose one side or the other or merge the contents yourself. For instance, you might resolve this conflict by replacing the entire

result. Git hasn’t automatically created a new merge commit. It has paused the process while you resolve the conflict. If you want to see which files are unmerged at any point after a merge conflict, you conflict-resolution markers to the files that have conflicts, so you can open them manually and resolve those conflicts. Your file contains a section that looks something like this: <<<<<<< HEAD:index in the bottom part. In order to resolve the conflict, you have to either choose one side or the other or merge the contents yourself. For instance, you might resolve this conflict by replacing the entire

add your own path variables to define personal paths, if needed. NOTE KiCad will automatically resolve versioned path variables from older versions of KiCad to the value of the corresponding variable variable is not explicitly defined itself. For example, ${KICAD7_FOOTPRINT_DIR} will automatically resolve to the value of ${KICAD8_FOOTPRINT_DIR} if there is no KICAD7_FOOTPRINT_DIR variable defined

add your own path variables to define personal paths, if needed. NOTE KiCad will automatically resolve versioned path variables from older versions of KiCad to the value of the corresponding variable variable is not explicitly defined itself. For example, ${KICAD7_FOOTPRINT_DIR} will automatically resolve to the value of ${KICAD8_FOOTPRINT_DIR} if there is no KICAD7_FOOTPRINT_DIR variable defined

add your own path variables to define personal paths, if needed. NOTE KiCad will automatically resolve versioned path variables from older versions of KiCad to the value of the corresponding variable variable is not explicitly defined itself. For example, ${KICAD7_FOOTPRINT_DIR} will automatically resolve to the value of ${KICAD8_FOOTPRINT_DIR} if there is no KICAD7_FOOTPRINT_DIR variable defined

is a footprint text item containing the string ${REFERENCE} , which is a text variable that will resolve to the value of the footprint’s Reference field once the footprint is on a board. These items path, an icon in the leftmost column will indicate an error. 125 NOTE KiCad will automatically resolve versioned path variables from older versions of KiCad to the value of the corresponding variable variable is not explicitly defined itself. For example, ${KICAD7_FOOTPRINT_DIR} will automatically resolve to the value of ${KICAD8_FOOTPRINT_DIR} if there is no KICAD7_FOOTPRINT_DIR variable defined

is a footprint text item containing the string ${REFERENCE} , which is a text variable that will resolve to the value of the footprint’s Reference field once the footprint is on a board. These items path, an icon in the leftmost column will indicate an error. 125 NOTE KiCad will automatically resolve versioned path variables from older versions of KiCad to the value of the corresponding variable variable is not explicitly defined itself. For example, ${KICAD7_FOOTPRINT_DIR} will automatically resolve to the value of ${KICAD8_FOOTPRINT_DIR} if there is no KICAD7_FOOTPRINT_DIR variable defined

weblate remote: git remote update weblate # Merge Weblate changes: git merge weblate/master # Resolve conflicts: edit … git add … … git commit # Push changes to upstream repository, Weblate will fetch QA_4_7 git merge weblate-one/QA_4_7 ... # Resolve conflicts git commit # Merge master branch: git checkout master git merge weblates-second/master ... # Resolve conflicts git commit # Push changes to the Weblate remote: git remote update weblate # Merge Weblate changes: git merge weblate/master # Resolve conflicts in the PO files: (continues on next page) 1.9. Frequently Asked Questions 51 The Weblate

weblate remote: git remote update weblate # Merge Weblate changes: git merge weblate/master # Resolve conflicts: edit … git add … … git commit # Push changes to upstream repository, Weblate will fetch QA_4_7 git merge weblate-one/QA_4_7 ... # Resolve conflicts git commit # Merge master branch: git checkout master git merge weblates-second/master ... # Resolve conflicts git commit # Push changes to the Weblate remote: git remote update weblate # Merge Weblate changes: git merge weblate/master # Resolve conflicts in the PO files: (continues on next page) 1.9. Frequently Asked Questions 51 The Weblate