How do I resolve conflicting files in the Copia Desktop App?

If you open a pull request and see the below message, you will need to resolve the conflict in the Desktop App by completing the following steps.

1. Select Open in Desktop App

2. Navigate to the branch you are trying to merge into (Most often this is going to be the main branch)

3. In the top toolbar, select Branch > Merge into current branch

4. Choose the branch you are trying to merge into this branch. You should see that a conflict is indicated in the bottom of the window.

    

   

5. You can resolve the conflict by choosing which version of the file you would like to keep

   
   1. Alternatively, if the file is text-based, you can click "Open with default program" to open in a text editor and resolve the conflicts manually. The image below shows how git highlights the differences between the branches. You can select one entire line or the other, or you can manually combine them
   2. This is what the file would look like after I've resolved the conflict using the text editor

6. After making your selection, select Commit Merge

7. Push your changes