Line data Source code
1 : /**
2 : * @file
3 : *
4 : * @brief A configuration for a simple automerge and guaranteed conflict resolution by one side
5 : *
6 : * @copyright BSD License (see LICENSE.md or https://www.libelektra.org)
7 : *
8 : */
9 :
10 : #ifndef IMPORTMERGECONFIGURATION_HPP_
11 : #define IMPORTMERGECONFIGURATION_HPP_
12 :
13 : #include <merging/automergeconfiguration.hpp>
14 :
15 : using namespace std;
16 :
17 : namespace kdb
18 : {
19 :
20 : namespace tools
21 : {
22 :
23 : namespace merging
24 : {
25 : // This strategy is primarily used for importing. It keeps all
26 : // keeps all keys present on both sides, but overwrites
27 : // the value of our side with theirs whenever keys conflict.
28 320 : class ImportMergeConfiguration : public AutoMergeConfiguration
29 : {
30 : public:
31 : virtual void configureMerger (ThreeWayMerge & merger) override;
32 : };
33 : } // namespace merging
34 : } // namespace tools
35 : } // namespace kdb
36 :
37 : #endif /* IMPORTMERGECONFIGURATION_HPP_ */
|