Line data Source code
1 : /**
2 : * @file
3 : *
4 : * @brief A strategy for taking the value of
5 : *
6 : * @copyright BSD License (see LICENSE.md or https://www.libelektra.org)
7 : *
8 : */
9 : #ifndef AUTOMERGESTRATEGY_HPP_
10 : #define AUTOMERGESTRATEGY_HPP_
11 :
12 : #include <merging/mergeconflictstrategy.hpp>
13 :
14 : namespace kdb
15 : {
16 :
17 : namespace tools
18 : {
19 :
20 : namespace merging
21 : {
22 :
23 : // This strategy resolves all conflicts where only one side was modified relative to
24 : // the base version. This means that the folllowing operation pairs can be resolved (ouroperation - theiroperation)
25 : // SAME - MODIFY
26 : // SAME - ADD
27 : // SAME - DELETE
28 : // MODIFY - SAME
29 : // ADD - SAME
30 : // DELETE - SAME
31 200 : class AutoMergeStrategy : public MergeConflictStrategy
32 : {
33 : public:
34 : virtual void resolveConflict (const MergeTask & task, Key & conflictKey, MergeResult & result) override;
35 : };
36 : } // namespace merging
37 : } // namespace tools
38 : } // namespace kdb
39 :
40 : #endif /* AUTOMERGESTRATEGY_HPP_ */
|