Workspace 6.21.5
Classes | Namespaces
modifymergeddifferenceswidget.h File Reference
#include <memory>
#include <QWidget>
#include "Workspace/Widgets/operationconnectionwidget.h"
#include "Tools/Widgets/mergeprogresswidget.h"
#include "Tools/workflowtoolsplugin.h"
Include dependency graph for modifymergeddifferenceswidget.h:
This graph shows which files directly or indirectly include this file:

Classes

class  ModifyMergedDifferencesWidget
 Offers user input to an auto merge process, such as choosing to ignore a merge or (to be implemented) choose which workflow to choose in case of conflict. More...
 

Namespaces

namespace  CSIRO
 Top level namespace for all Workspace code.
 
namespace  CSIRO::Tools
 
namespace  CSIRO::Tools::Ui