Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tutorial for standalone merge #3030

Open
Chemin1 opened this issue Oct 2, 2019 · 5 comments

Comments

@Chemin1
Copy link
Contributor

commented Oct 2, 2019

As discussed, better to leave this away. But a tutorial for the standalone merging tool would be interesting.

Originally posted by @markus2330 in #3011

@Chemin1 Chemin1 self-assigned this Oct 2, 2019
@Chemin1 Chemin1 added this to To do in Improve 3-way merge via automation Oct 2, 2019
@markus2330

This comment has been minimized.

Copy link
Contributor

commented Oct 2, 2019

Thank you for making this issue!

@Chemin1

This comment has been minimized.

Copy link
Contributor Author

commented Oct 7, 2019

What do we mean exactly with standalone? Calling "kdb (c)merge" or also with the little helper script that operates on files?

@markus2330

This comment has been minimized.

Copy link
Contributor

commented Oct 10, 2019

I mean a script that works more or less than the current helper script. I already described this standalone script in the last comment of #2869:

I was thinking of something like elektra-install-config-files <config file> <elektra path> which:

  1. if no such Elektra path exists, installs (copy+mount) the config file twice: once in the path, once in some origin path (so that you have origin)
  2. if the path already contains data, you do a 3-way merge with the given config file and the orig path (you can derive).

@kodebach: How will your script for installing the specifications be named? It would be good if these scripts are consistent.

@Chemin1

This comment has been minimized.

Copy link
Contributor Author

commented Oct 10, 2019

I already described this standalone script in the last comment of #2869:

Ahh, I didn't get that the tutorial should be for this script! I'll implement the script asap :)

@markus2330

This comment has been minimized.

Copy link
Contributor

commented Oct 10, 2019

Actually, the tutorial(s) should cover merging in general (your work) but I think the script will be the most easy way to describe it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
2 participants
You can’t perform that action at this time.