Elektra 0.11.0
merging Directory Reference

Files

 automergeconfiguration.hpp
 A configuration for a simple automerge.
 
 automergestrategy.hpp
 A strategy for taking the value of.
 
 importmergeconfiguration.hpp
 A configuration for a simple automerge and guaranteed conflict resolution by one side.
 
 interactivemergestrategy.hpp
 Interactive merge strategy asking for user input at each step.
 
 mergeconfiguration.hpp
 Base class for defining preconfigured merge configurations.
 
 mergeconflict.hpp
 Models a merge conflict.
 
 mergeconflictstrategy.hpp
 Interface for a MergeConflictStrategy.
 
 mergeresult.hpp
 Class modelling the result of a three way merge.
 
 mergetask.hpp
 Models a merge task.
 
 mergingkdb.hpp
 
 metamergestrategy.hpp
 Applies a MergeConflictStrategy on the metakeys.
 
 newkeystrategy.hpp
 A strategy which always takes the value from one side.
 
 onesidemergeconfiguration.hpp
 A configuration for a simple automerge and guaranteed conflict resolution by one side.
 
 onesidestrategy.hpp
 A strategy which always takes the value from one side.
 
 onesidevaluestrategy.hpp
 
 overwritemergeconfiguration.hpp
 A configuration for a simple automerge and guaranteed conflict resolution by one side.
 
 threewaymerge.hpp
 Implements a way to build and deal with a backend.