commit a70ad9c4807d4a70624cebee452e66e3769d22bf
parent 10e2d37d0f590e772ebfe07603baca573d051e59
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date: Mon, 30 May 2022 22:29:51 +0530
Update doc
Diffstat:
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/patches/README.md b/patches/README.md
@@ -5,6 +5,7 @@ This directory contains sizable user submitted patches that were rejected from m
The patches will be adapted on each release when necessary (v4.1 onwards). Each patch can be applied through its respective make variable during compilation. In case inter-patch merge conflicts occur, a compatability patch is provided and will automatically be applied.
## List of patches
+
| Patch (a-z) | Description | Make var |
| --- | --- | --- |
| gitstatus | Add git status column to the detail view. Provides command line flag `-G` to show column in normal mode. | `O_GITSTATUS` |
@@ -15,6 +16,8 @@ To apply a patch, use the corresponding make variable, e.g.:
make O_NAMEFIRST=1
+## Resolving patch conflicts
+
Whenever patch conflicts occur on the latest master, pull requests resolving them are welcome. Let's say a conflict occurs in the `restorepreview` patch. The best way to resolve this conflict would be something along the lines of:
- Ensure you're on latest master and run `cp src/nnn.c src/nnn.c.orig && make O_RESTOREPREVIEW=1`. This will save a copy of the source from master in `src/nnn.c.orig` and generate conflict markers in `src/nnn.c`.
