Skip to content

Pull request for master#283

Merged
mergify[bot] merged 2 commits into
Mergifyio:masterfrom
sileht:master
Oct 23, 2018
Merged

Pull request for master#283
mergify[bot] merged 2 commits into
Mergifyio:masterfrom
sileht:master

Conversation

@sileht
Copy link
Copy Markdown
Member

@sileht sileht commented Oct 23, 2018

merge: strict, handle manually closed/merged pr
merge: fixup logging

@sileht sileht added strict-workflow Strict Workflow work-in-progress Should not be merged yet. labels Oct 23, 2018
jd
jd previously requested changes Oct 23, 2018
Comment thread mergify_engine/actions/merge.py Outdated

if pull.g_pull.state == "closed":
redis.srem(_get_cache_key(pull), pull.g_pull.number)
LOG.debug("pull request have been closed or merged",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

has been

Comment thread mergify_engine/actions/merge.py Outdated
elif pull.is_behind():
# NOTE(sileht): Someone can have merged something manually in
# base branch in the meantime, so we have to update it again.
LOG.debug("pull request need to be updated again",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs

Comment thread mergify_engine/actions/merge.py Outdated
if not pull.is_behind():
if pull.g_pull.state == "closed":
redis.srem(_get_cache_key(pull), pull.g_pull.number)
LOG.debug("pull request have been closed or merged",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

has

@sileht
Copy link
Copy Markdown
Member Author

sileht commented Oct 23, 2018

Pull-request updated, HEAD is now 2eccd87

@mergify mergify Bot dismissed jd’s stale review October 23, 2018 07:44

Pull request has been modified.

@sileht
Copy link
Copy Markdown
Member Author

sileht commented Oct 23, 2018

Pull-request updated, HEAD is now 2eccd87

@sileht
Copy link
Copy Markdown
Member Author

sileht commented Oct 23, 2018

Pull-request updated, HEAD is now f3d937d

Pull requests can be closed or merged manually. We can skip
those and move to the next one.
@sileht sileht removed the work-in-progress Should not be merged yet. label Oct 23, 2018
@mergify mergify Bot merged commit 68f7aa8 into Mergifyio:master Oct 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

strict-workflow Strict Workflow

Development

Successfully merging this pull request may close these issues.

2 participants