Skip to content

Commit

Permalink
update readme
Browse files Browse the repository at this point in the history
  • Loading branch information
jakub-g committed Aug 24, 2016
1 parent 26c5154 commit 356c0a4
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
`git-resolve-conflict <strategy> <filename>`
===========================================================

> Resolve merge conflict in one file, using given strategy (--ours, --theirs, --union)
Say you have multiple git branches and you want to merge
between them, and always resolve conflicts **in a particular file** with a **fixed strategy**
(say `ours`).
Expand All @@ -18,6 +20,7 @@ being changed in both branches.

How to easily **resolve the merge conflict** in an **automated manner** (script) in such a situation?

**TL;DR** we need to use [git-merge-file](https://git-scm.com/docs/git-merge-file) but its API is not easy. Hence I wrote a wrapper `./git-resolve-conflict.sh` around it (I used temp files instead of process substitution to make it msys/mingw-friendly).

The usual suspects
==================
Expand Down

0 comments on commit 356c0a4

Please sign in to comment.