From a2fc4a70526943b3750bf56cb8c054104d372440 Mon Sep 17 00:00:00 2001 From: jrmarino Date: Wed, 22 Aug 2018 16:21:07 +0000 Subject: [PATCH] --- docs/howtos/HowToDPorts/index.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/howtos/HowToDPorts/index.mdwn b/docs/howtos/HowToDPorts/index.mdwn index 6232fa19..480db0f2 100644 --- a/docs/howtos/HowToDPorts/index.mdwn +++ b/docs/howtos/HowToDPorts/index.mdwn @@ -358,3 +358,19 @@ Note that after a new release of DragonFly, a new world has to be create rather # make merge-purge This can take several minutes + +## Merge the framework + + # make merge-mk + +It is very common that one or more of the patches will not apply. If that happens: + + 1. su automaton + 2. cd ~/DeltaPorts/special/Mk/diffs + 3. Regenerate the diff patch or patches as necessary + 4. exit + 5. merge-purge + 6. merge-mk + +Repeat cycle until every diff patch applies. + -- 2.41.0