public void merge()

in teamcity-premerge-agent/src/main/java/jetbrains/buildServer/premerge/PremergeBranchSupportImpl.java [138:159]

• 22 lines of code
• 4 McCabe index (conditional complexity)

  public void merge(String branch) throws VcsException {
    try {
      MergeCommand mergeCommand = myFacade.merge();
      mergeCommand.addConfig("user.name", "PremergeRobot");
      mergeCommand.addConfig("user.email", "premerge.plugin@jetbrains.com");
      mergeCommand.setBranches(branch)
                  .setQuiet(true)
                  .call();
      myProcess.setSuccess();
    } catch (VcsException vcsException) {
      String mergeCommits = getParameter("MERGE_HEAD");
      if (!StringUtil.isEmpty(mergeCommits)) {
        myProcess.getBuild().getBuildLogger().warning("Preliminary merge conflict with branch '" + branch + "'");
        mergeAbort();
      }
      throw vcsException;
    } catch (Exception e) {
      myProcess.getBuild().getBuildLogger().error("Merging '" + branch +"' error");
      throw new VcsException(e);
    }
    myProcess.getBuild().getBuildLogger().message("'" + branch + "' was merged");
  }