1#pragma once
2
3/****************************************************************************************
4 ** GitQlient is an application to manage and operate one or several Git repositories. With
5 ** GitQlient you will be able to add commits, branches and manage all the options Git provides.
6 ** Copyright (C) 2021 Francesc Martinez
7 **
8 ** LinkedIn: www.linkedin.com/in/cescmm/
9 ** Web: www.francescmm.com
10 **
11 ** This program is free software; you can redistribute it and/or
12 ** modify it under the terms of the GNU Lesser General Public
13 ** License as published by the Free Software Foundation; either
14 ** version 2 of the License, or (at your option) any later version.
15 **
16 ** This program is distributed in the hope that it will be useful,
17 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
18 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19 ** Lesser General Public License for more details.
20 **
21 ** You should have received a copy of the GNU Lesser General Public
22 ** License along with this library; if not, write to the Free Software
23 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
24 ***************************************************************************************/
25
26#include <GitExecResult.h>
27
28#include <QSharedPointer>
29
30class GitBase;
31class GitCache;
32
33class GitMerge
34{
35public:
36 explicit GitMerge(const QSharedPointer<GitBase> &gitBase, QSharedPointer<GitCache> cache);
37
38 bool isInMerge() const;
39 GitExecResult merge(const QString &into, QStringList sources);
40 GitExecResult abortMerge() const;
41 GitExecResult applyMerge() const;
42 GitExecResult squashMerge(const QString &into, QStringList sources, const QString &msg = QString()) const;
43
44private:
45 QSharedPointer<GitBase> mGitBase;
46 QSharedPointer<GitCache> mCache;
47};
48