Package com.gitblit.utils.JGitUtils

Examples of com.gitblit.utils.JGitUtils.MergeResult

1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
    try {
      oldRef = getRepository().getRef(ticket.mergeTo);
    } catch (IOException e) {
      LOGGER.error("failed to get ref for " + ticket.mergeTo, e);
    }
    MergeResult mergeResult = JGitUtils.merge(
        getRepository(),
        patchset.tip,
        ticket.mergeTo,
        committer,
        message);
View Full Code Here
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
    try {
      oldRef = getRepository().getRef(ticket.mergeTo);
    } catch (IOException e) {
      LOGGER.error("failed to get ref for " + ticket.mergeTo, e);
    }
    MergeResult mergeResult = JGitUtils.merge(
        getRepository(),
        patchset.tip,
        ticket.mergeTo,
        committer,
        message);
View Full Code Here
TOP

Related Classes of com.gitblit.utils.JGitUtils.MergeResult

  • com.gitblit.git.PatchsetReceivePack
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.