Traversing Git Conflict Markers
Today I solved several nagging inefficiencies in my Vim setup. One was memorizing a mapping for traversing Git conflict markers.
If you've ever had a merge conflict and opened the unresolved file, you'll see these markers:
```javascript
<<<<<<<
console.log('keep this code?')
=======
console.log('...or this?')
>>>>>>>
```
Deciding what to keep can be a process, and [Vim-Unimpaired](https://github.com/tpope/vim-unimpaired) makes it easier by providing mappings to jump between the markers-- `]n` for the next marker, `[n` for the previous marker. Use these to traverse the diff and learn about what might be gained or lost during resolution.
jakeworth
August 8, 2018