git-node v8: prompt on merge conflict

[hashseed]

Instead of performing git apply and aborting if it fails (which happens often), perform patch -p1 --merge instead to produce merge artifacts and then prompt for user input to continue.

It should look something like this:

[hashseed]

This addresses #303

[targos]

Nice, thank you! I tested it locally and it works 👍

[targos]

I will follow up with another PR that uses "backport" instead of "cherry-pick" in the commit message when a conflict occurs, but after #304 is landed.

[codecov]

Codecov Report

Merging #307 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #307   +/-   ##
=======================================
  Coverage   74.03%   74.03%           
=======================================
  Files          22       22           
  Lines        1406     1406           
=======================================
  Hits         1041     1041           
  Misses        365      365

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f7a1634...22315aa. Read the comment docs.

[hashseed]

I don't actually have power to merge this :)

[targos]

I do ;)