L
L
laphroaig2019-10-08 01:54:54
bash
laphroaig, 2019-10-08 01:54:54

Is there a console version of kdiff3 or a recursive sdiff?

There are a number of projects, each of which has a folder with files of various default settings. These settings are universal for all projects and are updated periodically. It is not recommended to make changes locally, for a specific project, but if you really need it, then you can. There is a script that locally updates files according to the following algorithm (for all files recursively):
1. the new file is accepted automatically
2. if there were no changes in the local file, then it is updated
3. If there were local changes, then interactively select:
3.1 Accept the new version file
3.2 Keep the local version of file
3.3. Merge interactively with sdiff
There is an existing script that does a great job with this, but it is tailored for a specific infrastructure, and it's time to update it. It is not particularly complicated, but maybe there are universal utilities that solve a similar problem?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
R
Radjah, 2019-10-08
@Radjah

> It is not recommended to make changes locally for a specific project, but if you really need it, you can.
It is better not to engage in bone-building, but to add the inclusion of user configs after processing the default ones.
At least that's how it's done in Debian for a lot of software.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question