44 lines
1.4 KiB
C
44 lines
1.4 KiB
C
|
/*
|
||
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||
|
|
*
|
||
|
|
* Copyright (C) 2023 KiCad Developers, see AUTHORS.TXT for contributors.
|
||
|
|
*
|
||
|
|
* This program is free software; you can redistribute it and/or
|
||
|
|
* modify it under the terms of the GNU General Public License
|
||
|
|
* as published by the Free Software Foundation; either version 3
|
||
|
|
* of the License, or (at your option) any later version.
|
||
|
|
*
|
||
|
|
* This program is distributed in the hope that it will be useful,
|
||
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
|
|
* GNU General Public License for more details.
|
||
|
|
*
|
||
|
|
* You should have received a copy of the GNU General Public License
|
||
|
|
* along with this program; if not, you may find one here:
|
||
|
|
* http://www.gnu.org/licenses/gpl-3.0.html
|
||
|
|
* or you may search the http://www.gnu.org website for the version 3 license,
|
||
|
|
* or you may write to the Free Software Foundation, Inc.,
|
||
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||
|
|
*/
|
||
|
|
|
||
|
|
#ifndef GIT_RESOLVE_CONFLICT_HANDLER_H
|
||
|
|
#define GIT_RESOLVE_CONFLICT_HANDLER_H
|
||
|
|
|
||
|
|
#include <git2.h>
|
||
|
|
|
||
|
|
class wxString;
|
||
|
|
|
||
|
|
class GIT_RESOLVE_CONFLICT_HANDLER
|
||
|
|
{
|
||
|
|
public:
|
||
|
|
GIT_RESOLVE_CONFLICT_HANDLER( git_repository* aRepository );
|
||
|
|
virtual ~GIT_RESOLVE_CONFLICT_HANDLER();
|
||
|
|
|
||
|
|
bool PerformResolveConflict();
|
||
|
|
|
||
|
|
private:
|
||
|
|
git_repository* m_repository;
|
||
|
|
};
|
||
|
|
|
||
|
|
#endif // GIT_RESOLVE_CONFLICT_HANDLER_H
|