<commit_before>[![npm](https://nodei.co/npm/git-conflicts.png)](https://nodei.co/npm/git-conflicts/)

# git-conflicts

[![Build Status][travis-badge]][travis]
[![Dependency Status][david-badge]][david]

Resolve merge conflicts in the editor. With `conflicts`, you do all the work yourself.

[travis]: https://travis-ci.org/eush77/git-conflicts
[travis-badge]: https://travis-ci.org/eush77/git-conflicts.svg?branch=master
[david]: https://david-dm.org/eush77/git-conflicts
[david-badge]: https://david-dm.org/eush77/git-conflicts.png

## Usage

```
git conflicts
```

Opens each conflict in the editor. You resolve the conflict, save and exit, and go to the next one.

Conflict resolution is a process of transforming this:

```diff
<<<<<<< branch1
Content from branch 1.
=======
Content from branch 2.
>>>>>>> branch2
```

into this:

```diff
<<<<<<< branch1
Resolved conflict.
>>>>>>> branch2
```

Note that `conflicts` assumes you leave header and footer lines and put resolved lines in between.

You can abort conflict resolution process at any time by exiting with non-zero return code from the editor (editors not capable of that are not worth using).

```
git conflicts [file]...
```

Run `conflicts` on specified files.

## Configuration

- `$EDITOR` — set this variable to override the default editor.<commit_msg>readme: add more info on aborting resolution<commit_after>[![npm](https://nodei.co/npm/git-conflicts.png)](https://nodei.co/npm/git-conflicts/)

# git-conflicts

[![Build Status][travis-badge]][travis]
[![Dependency Status][david-badge]][david]

Resolve merge conflicts in the editor. With `conflicts`, you do all the work yourself.

[travis]: https://travis-ci.org/eush77/git-conflicts
[travis-badge]: https://travis-ci.org/eush77/git-conflicts.svg?branch=master
[david]: https://david-dm.org/eush77/git-conflicts
[david-badge]: https://david-dm.org/eush77/git-conflicts.png

## Usage

```
git conflicts
```

Opens each conflict in the editor. You resolve the conflict, save and exit, and go to the next one.

Conflict resolution is a process of transforming this:

```diff
<<<<<<< branch1
Content from branch 1.
=======
Content from branch 2.
>>>>>>> branch2
```

into this:

```diff
<<<<<<< branch1
Resolved conflict.
>>>>>>> branch2
```

Note that `conflicts` assumes you leave header and footer lines and put resolved lines in between.

You can abort conflict resolution process by exiting with non-zero code from the editor or by leaving the document blank (or by just removing the conflict markers).

```
git conflicts [file]...
```

Run `conflicts` on specified files.

## Configuration

- `$EDITOR` — set this variable to override the default editor.
{'fraction_non_alphanumeric': 0.14813432835820894, 'fraction_numerical': 0.010447761194029851, 'mean_word_length': 4.644210526315789, 'pattern_counts': {'":': 0, '<': 31, '<?xml version=': 0, '>': 31, 'https://': 12, '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': '3415934', 'n_tokens_mistral': 909, 'n_tokens_neox': 851, 'n_words': 281}