Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't raise conflicts #2465

Merged
merged 2 commits into from
Jul 20, 2016
Merged

Don't raise conflicts #2465

merged 2 commits into from
Jul 20, 2016

Conversation

RaitoBezarius
Copy link
Member

No description provided.

@gitmate-bot
Copy link
Collaborator

Comment on ff25a8ebe2c286fecd4b79a4011fa70a59832550.

Shortlog of HEAD commit is 30 character(s) longer than the limit (80 > 50).

GitCommitBear, severity NORMAL, section commit.

@RaitoBezarius RaitoBezarius force-pushed the raito/dont-raise-when-diffs-are-equal branch from ff25a8e to 949d5f2 Compare July 20, 2016 21:04
@gitmate-bot
Copy link
Collaborator

Comment on 949d5f2f25c3038d7ba6145557a91db9d488ee99.

Shortlog of HEAD commit is 30 character(s) longer than the limit (80 > 50).

GitCommitBear, severity NORMAL, section commit.

@RaitoBezarius RaitoBezarius force-pushed the raito/dont-raise-when-diffs-are-equal branch from 949d5f2 to 1e3d115 Compare July 20, 2016 21:06
@sils
Copy link
Member

sils commented Jul 20, 2016

ack 8cbaaee 1e3d115

@sils sils added process/approved The PR is approved and will be merged soon and removed process/pending review labels Jul 20, 2016
@sils
Copy link
Member

sils commented Jul 20, 2016

@rultor merge

@rultor
Copy link
Contributor

rultor commented Jul 20, 2016

@rultor merge

@sils1297 OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit 1e3d115 into coala:master Jul 20, 2016
@rultor
Copy link
Contributor

rultor commented Jul 20, 2016

@rultor merge

@sils1297 Done! FYI, the full log is here (took me 2min)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
process/approved The PR is approved and will be merged soon size/S
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@RaitoBezarius @gitmate-bot @sils @rultor