From 392720066e2ac74572099f23ee25373d9c99c7ba Mon Sep 17 00:00:00 2001 From: George <31376482+george-gca@users.noreply.github.com> Date: Mon, 22 Jan 2024 12:37:25 -0300 Subject: [PATCH] Added diff tools to INSTALL.md --- INSTALL.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 8e2c408..45d4598 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -218,4 +218,5 @@ $ git rebase v0.11.0 If you have extensively customized a previous version, it might be trickier to upgrade. You can still follow the steps above, but `git rebase` may result in merge conflicts that must be resolved. See [git rebase manual](https://help.github.com/en/github/using-git/about-git-rebase) and how to [resolve conflicts](https://help.github.com/en/github/using-git/resolving-merge-conflicts-after-a-git-rebase) for more information. -If rebasing is too complicated, we recommend re-installing the new version of the theme from scratch and port over your content and changes from the previous version manually. +If rebasing is too complicated, we recommend re-installing the new version of the theme from scratch and port over your content and changes from the previous version manually. You can use tools like [meld](https://meldmerge.org/) +or [winmerge](https://winmerge.org/) to help in this process.