Skip to content

Add a linear_fake_merge option (defaulting to True)#139

Open
cgwalters wants to merge 1 commit intobarosl:masterfrom
cgwalters:option-disable-linear-fake-merge
Open

Add a linear_fake_merge option (defaulting to True)#139
cgwalters wants to merge 1 commit intobarosl:masterfrom
cgwalters:option-disable-linear-fake-merge

Conversation

@cgwalters
Copy link

One of my projects (projectatomic/rpm-ostree) has a protected master
branch. I was rather horrified to realize that homu force-pushes to
master by default. Admittedly, I understand this is the only way to
make github think the PR was merged (as opposed to just closed).

But in my mind, that's a deficiency of github - it should have an API
to allow us to "close merged with this commit".

Anyways, add an option so that those who prefer closing-as-unmerged over force
pushing can do that today.

@cgwalters
Copy link
Author

Thinking about this a bit more, one thing we can do is change the title of the PR to say [merged] foo bar baz.

One of my projects (projectatomic/rpm-ostree) has a protected master
branch.  I was rather horrified to realize that homu force-pushes to
master by default.  Admittedly, I understand this is the only way to
make github think the PR was merged (as opposed to just closed).

But in my mind, that's a deficiency of github - it should have an API
to allow us to "close merged with this commit".

Anyways, add an option so that those who prefer closed over force
pushing can do that today.

We at least retitle the commit so that it's more clear it was merged.
@cgwalters cgwalters force-pushed the option-disable-linear-fake-merge branch from 324c907 to 93067ad Compare March 16, 2016 21:20
@cgwalters
Copy link
Author

Now updated to also retitle the commit with [merged]

@ashcrow
Copy link

ashcrow commented Mar 18, 2016

👍 looks good!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments