<p>How do I resolve merge conflicts in my Git repository?</p>

Identify which files are in conflict (Git should tell you this).
Open each file and examine the diffs; Git demarcates them.  Hopefully it will be obvious which version of each block to keep.  You may need to discuss it with fellow developers who committed the code.
Once you've resolved the conflict in a file
```
git add the_file
```
.
Once you've resolved
all
conflicts, do
```
git rebase --continue
```
or whatever command 
Git said to do when you completed.