<commit_before># vscode-better-merge

Better visual merge conflict support for [Visual Studio Code](http://code.visualstudio.com/), insired by [merge-conflicts](https://atom.io/packages/merge-conflicts) for Atom.

![Demo animation 1](content/1.gif)

Avaliable on the [Visual Studio Extension Marketplace](https://marketplace.visualstudio.com/items?itemName=pprice.better-merge).

## Features

 - Indivual conflicts are highlighted in each file
 - Command palette commands for resolving and navigating between merge conflicts (see below)
 - CodeLens actions to either accept "current", "incoming" or "both" changes
 - Navigation shortcuts between conflicts

### Commands

All commands use a double key chord combination by default. First press `Alt+M` then press the second key.

 - `Accept current` - `Alt+M, 1` - Accept current (local) change in the current conflict
 - `Accept incoming` - `Alt+M, 2` - Accept incoming change in the current conflict
 - `Accept both` - `Alt+M, 3` - Accept the union of both the current and incoming change for the current conflict
 - `Accept selection` - `Alt+M, Enter` - Accept the change the editor cursor is currenty within
 - `Next conflict` - `Alm+M, Down Arrow` - Navigate to the next conflict in the current file
 - `Previous conflict` - `Alm+M, Down Arrow` - Navigate to the previous conflict in the current file
 - `Accept all current` - Accpect all current changes in the current file
 - `Accept all incoming` - Accept all incoming changes in the current file
 - `Accept all both` - Accept all changes as a "both" merge in the current file

*NOTE*: All accept commands can be undone with Undo (`Ctrl+Z` / `Cmd+Z`)

### Key bindings
<commit_msg>Fix typo<commit_after># vscode-better-merge

Better visual merge conflict support for [Visual Studio Code](http://code.visualstudio.com/), insired by [merge-conflicts](https://atom.io/packages/merge-conflicts) for Atom.

![Demo animation 1](content/1.gif)

Avaliable on the [Visual Studio Extension Marketplace](https://marketplace.visualstudio.com/items?itemName=pprice.better-merge).

## Features

 - Indivual conflicts are highlighted in each file
 - Command palette commands for resolving and navigating between merge conflicts (see below)
 - CodeLens actions to either accept "current", "incoming" or "both" changes
 - Navigation shortcuts between conflicts

### Commands

All commands use a double key chord combination by default. First press `Alt+M` then press the second key.

 - `Accept current` - `Alt+M, 1` - Accept current (local) change in the current conflict
 - `Accept incoming` - `Alt+M, 2` - Accept incoming change in the current conflict
 - `Accept both` - `Alt+M, 3` - Accept the union of both the current and incoming change for the current conflict
 - `Accept selection` - `Alt+M, Enter` - Accept the change the editor cursor is currenty within
 - `Next conflict` - `Alm+M, Down Arrow` - Navigate to the next conflict in the current file
 - `Previous conflict` - `Alm+M, Down Arrow` - Navigate to the previous conflict in the current file
 - `Accept all current` - Accept all current changes in the current file
 - `Accept all incoming` - Accept all incoming changes in the current file
 - `Accept all both` - Accept all changes as a "both" merge in the current file

*NOTE*: All accept commands can be undone with Undo (`Ctrl+Z` / `Cmd+Z`)

### Key bindings

{'fraction_non_alphanumeric': 0.09495548961424333, 'fraction_numerical': 0.002967359050445104, 'mean_word_length': 4.234472049689441, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 3, 'https://': 4, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '1102900', 'n_tokens_mistral': 946, 'n_tokens_neox': 897, 'n_words': 421}