\hypertarget{mergeconflict_8hpp}{}\doxysection{mergeconflict.\+hpp File Reference}
\label{mergeconflict_8hpp}\index{mergeconflict.hpp@{mergeconflict.hpp}}


Models a merge conflict.  


{\ttfamily \#include $<$string$>$}\newline
{\ttfamily \#include $<$toolexcept.\+hpp$>$}\newline
Include dependency graph for mergeconflict.\+hpp\+:
\nopagebreak
\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[width=350pt]{mergeconflict_8hpp__incl}
\end{center}
\end{figure}
This graph shows which files directly or indirectly include this file\+:
\nopagebreak
\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[width=350pt]{mergeconflict_8hpp__dep__incl}
\end{center}
\end{figure}
\doxysubsection*{Namespaces}
\begin{DoxyCompactItemize}
\item 
 \mbox{\hyperlink{namespacekdb}{kdb}}
\begin{DoxyCompactList}\small\item\em This is the main namespace for the C++ binding and libraries. \end{DoxyCompactList}\item 
 \mbox{\hyperlink{namespacekdb_1_1tools}{kdb\+::tools}}
\begin{DoxyCompactList}\small\item\em This namespace is for the libtool library. \end{DoxyCompactList}\end{DoxyCompactItemize}
\doxysubsection*{Enumerations}
\begin{DoxyCompactItemize}
\item 
enum \mbox{\hyperlink{mergeconflict_8hpp_a1040b490b1727d2b88a884c38cbfd717}{kdb\+::tools\+::merging\+::\+Conflict\+Operation}} \{ \mbox{\hyperlink{mergeconflict_8hpp_a1040b490b1727d2b88a884c38cbfd717a2704c327147a4a9d28de0de50f4c9070}{kdb\+::tools\+::merging\+::\+C\+O\+N\+F\+L\+I\+C\+T\+\_\+\+A\+DD}}
 \}
\end{DoxyCompactItemize}


\doxysubsection{Detailed Description}
Models a merge conflict. 

\begin{DoxyCopyright}{Copyright}
B\+SD License (see L\+I\+C\+E\+N\+S\+E.\+md or \href{https://www.libelektra.org}{\texttt{ https\+://www.\+libelektra.\+org}}) 
\end{DoxyCopyright}


\doxysubsection{Enumeration Type Documentation}
\mbox{\Hypertarget{mergeconflict_8hpp_a1040b490b1727d2b88a884c38cbfd717}\label{mergeconflict_8hpp_a1040b490b1727d2b88a884c38cbfd717}} 
\index{mergeconflict.hpp@{mergeconflict.hpp}!ConflictOperation@{ConflictOperation}}
\index{ConflictOperation@{ConflictOperation}!mergeconflict.hpp@{mergeconflict.hpp}}
\doxysubsubsection{\texorpdfstring{ConflictOperation}{ConflictOperation}}
{\footnotesize\ttfamily enum \mbox{\hyperlink{mergeconflict_8hpp_a1040b490b1727d2b88a884c38cbfd717}{kdb\+::tools\+::merging\+::\+Conflict\+Operation}}}

\begin{DoxyEnumFields}{Enumerator}
\raisebox{\heightof{T}}[0pt][0pt]{\index{CONFLICT\_ADD@{CONFLICT\_ADD}!mergeconflict.hpp@{mergeconflict.hpp}}\index{mergeconflict.hpp@{mergeconflict.hpp}!CONFLICT\_ADD@{CONFLICT\_ADD}}}\mbox{\Hypertarget{mergeconflict_8hpp_a1040b490b1727d2b88a884c38cbfd717a2704c327147a4a9d28de0de50f4c9070}\label{mergeconflict_8hpp_a1040b490b1727d2b88a884c38cbfd717a2704c327147a4a9d28de0de50f4c9070}} 
C\+O\+N\+F\+L\+I\+C\+T\+\_\+\+A\+DD&Conflict because of adding key. \\
\hline

\end{DoxyEnumFields}
