Variable MergeStrategiesConst

Type Declaration

• Readonlyfast_forward: {
      description: "If the source branch is out of date with the target branch, create a merge commit. Otherwise, update the target branch to the latest commit on the source branch.";
      detail: "--ff";
      name: "Fast-forward";
  }

• Readonlyfast_forward_only: {
      description: "If the source branch is out of date with the target branch, reject the merge request. Otherwise, update the target branch to the latest commit on the source branch.";
      detail: "--ff-only";
      name: "Fast-forward only";
  }

• Readonlymerge: {
      description: "Always create a new merge commit and update the target branch to it, even if the source branch is already up to date with the target branch.";
      detail: "--no-ff";
      name: "Merge commit";
  }

• Readonlyrebase_fast_forward: {
      description: "Commits from the source branch onto the target branch, creating a new non-merge commit for each incoming commit. Fast-forwards the target branch with the resulting commits.";
      detail: "rebase + merge --ff-only";
      name: "Rebase, fast-forward";
  }

• Readonlyrebase_merge: {
      description: "Commits from the source branch onto the target branch, creating a new non-merge commit for each incoming commit. Creates a merge commit to update the target branch.";
      detail: "rebase + merge --no-ff";
      name: "Rebase, merge";
  }

• Readonlysquash: {
      description: "Combine all commits into one new non-merge commit on the target branch.";
      detail: "--squash";
      name: "Squash";
  }

• Readonlysquash_fast_forward: {
      description: "If the source branch is out of date with the target branch, reject the merge request. Otherwise, combine all commits into one new non-merge commit on the target branch.";
      detail: "--squash --ff-only";
      name: "Squash, fast-forward only";
  }