Feature Request: Allow Auto Merge with Squash or Rebase option

[vimitd]

Hi All,

is it possible to auto merge with squash or rebases? I think if we don't have this feature we need to implement this because its difficult to look into history.

[aairey]

With only rebase allowed on the repo you get this error:

Unable to merge pull, error: merging pull request: PUT https://api.github.com/repos/org/repo/pulls/112/merge: 405 This branch must not contain merge commits. []

[nitrocode]

Seems like this ability exists but perhaps there is a bug or perhaps your pr did have merge conflicts?

atlantis/server/events/vcs/github_client.go

Lines 617 to 666 in 9fa4cd3

	func (g *GithubClient) MergePull(pull models.PullRequest, _ models.PullRequestOptions) error {
	// Users can set their repo to disallow certain types of merging.
	// We detect which types aren't allowed and use the type that is.
	repo, resp, err := g.client.Repositories.Get(g.ctx, pull.BaseRepo.Owner, pull.BaseRepo.Name)
	if resp != nil {
	g.logger.Debug("GET /repos/%v/%v returned: %v", pull.BaseRepo.Owner, pull.BaseRepo.Name, resp.StatusCode)
	}
	if err != nil {
	return errors.Wrap(err, "fetching repo info")
	}
	const (
	defaultMergeMethod = "merge"
	rebaseMergeMethod = "rebase"
	squashMergeMethod = "squash"
	)
	method := defaultMergeMethod
	if !repo.GetAllowMergeCommit() {
	if repo.GetAllowRebaseMerge() {
	method = rebaseMergeMethod
	} else if repo.GetAllowSquashMerge() {
	method = squashMergeMethod
	}
	}
	// Now we're ready to make our API call to merge the pull request.
	options := &github.PullRequestOptions{
	MergeMethod: method,
	}
	g.logger.Debug("PUT /repos/%v/%v/pulls/%d/merge", repo.Owner, repo.Name, pull.Num)
	mergeResult, resp, err := g.client.PullRequests.Merge(
	g.ctx,
	pull.BaseRepo.Owner,
	pull.BaseRepo.Name,
	pull.Num,
	// NOTE: Using the empty string here causes GitHub to autogenerate
	// the commit message as it normally would.
	"",
	options)
	if resp != nil {
	g.logger.Debug("POST /repos/%v/%v/pulls/%d/merge returned: %v", repo.Owner, repo.Name, pull.Num, resp.StatusCode)
	}
	if err != nil {
	return errors.Wrap(err, "merging pull request")
	}
	if !mergeResult.GetMerged() {
	return fmt.Errorf("could not merge pull request: %s", mergeResult.GetMessage())
	}
	return nil
	}

[aairey]

I believe this is a duplicate of #1176

It seems it was fixed in March, but the changes were rolled back.

A final fix is still needed imho - but more discussion is available on the other issue.