KIGIT_CONFLICT_SIDES Struct Reference

#include <kicad_git_common.h>

Public Attributes
wxString	path
	Repository-relative path of the conflicted file.
wxString	ancestorFile
	Extracted common-ancestor version, an empty file when absent.
wxString	oursFile
	Extracted local version, an empty file when absent.
wxString	theirsFile
	Extracted remote version, an empty file when absent.
bool	hasAncestor = false
	False when the file did not exist in the common ancestor.
bool	hasOurs = false
	False when the local side deleted the file.
bool	hasTheirs = false
	False when the remote side deleted the file.

Detailed Description

Definition at line 199 of file kicad_git_common.h.

Member Data Documentation

ancestorFile

wxString KIGIT_CONFLICT_SIDES::ancestorFile

Extracted common-ancestor version, an empty file when absent.

Definition at line 202 of file kicad_git_common.h.

Referenced by GIT_COMMIT_PANE::finishPullConflictPreparation(), and LIBGIT_BACKEND::GetMergeConflicts().

hasAncestor

bool KIGIT_CONFLICT_SIDES::hasAncestor = false

False when the file did not exist in the common ancestor.

Definition at line 205 of file kicad_git_common.h.

Referenced by GIT_COMMIT_PANE::finishPullConflictPreparation(), and LIBGIT_BACKEND::GetMergeConflicts().

hasOurs

bool KIGIT_CONFLICT_SIDES::hasOurs = false

False when the local side deleted the file.

Definition at line 206 of file kicad_git_common.h.

Referenced by GIT_COMMIT_PANE::finishPullConflictPreparation(), and LIBGIT_BACKEND::GetMergeConflicts().

hasTheirs

bool KIGIT_CONFLICT_SIDES::hasTheirs = false

False when the remote side deleted the file.

Definition at line 207 of file kicad_git_common.h.

Referenced by GIT_COMMIT_PANE::finishPullConflictPreparation(), and LIBGIT_BACKEND::GetMergeConflicts().

oursFile

wxString KIGIT_CONFLICT_SIDES::oursFile

Extracted local version, an empty file when absent.

Definition at line 203 of file kicad_git_common.h.

Referenced by GIT_COMMIT_PANE::finishPullConflictPreparation(), and LIBGIT_BACKEND::GetMergeConflicts().

path

wxString KIGIT_CONFLICT_SIDES::path

Repository-relative path of the conflicted file.

Definition at line 201 of file kicad_git_common.h.

Referenced by GIT_COMMIT_PANE::finishPullConflictPreparation(), and LIBGIT_BACKEND::GetMergeConflicts().

theirsFile

wxString KIGIT_CONFLICT_SIDES::theirsFile

Extracted remote version, an empty file when absent.

Definition at line 204 of file kicad_git_common.h.

Referenced by GIT_COMMIT_PANE::finishPullConflictPreparation(), and LIBGIT_BACKEND::GetMergeConflicts().

---

The documentation for this struct was generated from the following file:

• kicad_git_common.h