KIGIT_FP_MERGE Class Reference

libgit2 merge driver for .kicad_mod footprint files (members of a .pretty directory). More...

#include <kigit_fp_merge.h>

Inheritance diagram for KIGIT_FP_MERGE:

Public Member Functions
	KIGIT_TRIVIAL_MERGE_BASE (git_merge_driver_source *aSource, git_buf *aBuf)
int	Merge ()

Static Public Member Functions
static int	Apply (const git_merge_driver_source *aSrc, const char **aPathOut, unsigned int *aModeOut, git_buf *aMergedOut)

Private Attributes
git_merge_driver_source *	m_mergeDriver
git_buf *	m_result

Detailed Description

libgit2 merge driver for .kicad_mod footprint files (members of a .pretty directory).

Same trivial-case 3-way pattern as KIGIT_SCH_MERGE. Complex 3-way merges defer to the mergetool app. Registered as "kicad-fp".

Definition at line 33 of file kigit_fp_merge.h.

Member Function Documentation

Apply()

static int KIGIT_TRIVIAL_MERGE_BASE< KIGIT_FP_MERGE >::Apply ( const git_merge_driver_source * aSrc, const char ** aPathOut, unsigned int * aModeOut, git_buf * aMergedOut )

inlinestaticinherited

Definition at line 63 of file kigit_trivial_merge_base.h.

Referenced by PCB::IFACE::OnKifaceStart().

KIGIT_TRIVIAL_MERGE_BASE()

KIGIT_TRIVIAL_MERGE_BASE< DERIVED >::KIGIT_TRIVIAL_MERGE_BASE ( git_merge_driver_source * aSource, git_buf * aBuf )

inline

Definition at line 40 of file kigit_trivial_merge_base.h.

Merge()

int KIGIT_TRIVIAL_MERGE_BASE< KIGIT_FP_MERGE >::Merge ( )

inlineinherited

Definition at line 45 of file kigit_trivial_merge_base.h.

Member Data Documentation

m_mergeDriver

git_merge_driver_source* KIGIT_TRIVIAL_MERGE_BASE< KIGIT_FP_MERGE >::m_mergeDriver

privateinherited

Definition at line 70 of file kigit_trivial_merge_base.h.

m_result

git_buf* KIGIT_TRIVIAL_MERGE_BASE< KIGIT_FP_MERGE >::m_result

privateinherited

Definition at line 71 of file kigit_trivial_merge_base.h.

---

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

• kigit_fp_merge.h