atlantis icon indicating copy to clipboard operation
atlantis copied to clipboard

Published 20 hours ago • verified publisher icon runatlantis

Feature Request: Allow Auto Merge with Squash or Rebase option

Open vimitd opened this issue 3 years ago • 6 comments

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.

vimitd avatar Feb 04 '22 03:02 vimitd

+1

musabmirza-amperon avatar Jul 12 '23 13:07 musabmirza-amperon

+1

ralphotowo avatar Jul 19 '23 12:07 ralphotowo

+1

codrinh avatar Dec 07 '23 16:12 codrinh

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. []

aairey avatar Feb 02 '24 09:02 aairey

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

https://github.com/runatlantis/atlantis/blob/9fa4cd3c344df2387baca5d50557bc4710e8be13/server/events/vcs/github_client.go#L617-L666

nitrocode avatar Feb 02 '24 14:02 nitrocode

I believe this is a duplicate of https://github.com/runatlantis/atlantis/issues/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.

aairey avatar Jun 27 '24 09:06 aairey