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.

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

#1039 Use merged and validated of version .rultor.yml for merge command. #1070

Merged
merged 2 commits into from
Mar 26, 2016
Merged

Conversation

xupyprmv
Copy link
Contributor

#1039 I implemented validated method, that checks that merged .rultor.yml has no changes in architect and commander sections. I covered validated method by unit tests. I added one puzzle (to implement merged method, write IT for validated method and use it.

This is a copy of #1064 that cannot be reopened. That's why I created new one.

@original-brownbear
Copy link
Contributor

@xupyprmv while I just give this a quick read to be safe :)
You you please add the closed PR to this PR's description and also explain the situation as to why we have two PRs here in the issue ?
Thanks!

new TalkIssues(Profiles.github(), xml).get().repo()
);
profile = this.merged(
master,
Copy link
Contributor

Choose a reason for hiding this comment

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

@xupyprmv the variable master is redundant here, please inline this real quick :)

@original-brownbear
Copy link
Contributor

@xupyprmv found one small thing, not sure if this was in the other PR and I just missed it (can't see it anymore now :/) or somehow new. Either way please fix it :) Thanks!

@xupyprmv
Copy link
Contributor Author

@original-brownbear I modified PR description and fixed code. Great thanks for help. Please continue.

@original-brownbear
Copy link
Contributor

@rultor merge please :)

@original-brownbear
Copy link
Contributor

@xupyprmv thanks for the good job :)

@rultor
Copy link
Collaborator

rultor commented Mar 26, 2016

@rultor merge please :)

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

@rultor rultor merged commit 91c1331 into yegor256:master Mar 26, 2016
@rultor
Copy link
Collaborator

rultor commented Mar 26, 2016

@rultor merge please :)

@original-brownbear Done! FYI, the full log is here (took me 17min)

@original-brownbear
Copy link
Contributor

@rultor deploy

@rultor
Copy link
Collaborator

rultor commented Mar 26, 2016

@rultor deploy

@original-brownbear OK, I'll try to deploy now. You can check the progress here

@rultor
Copy link
Collaborator

rultor commented Mar 26, 2016

@rultor deploy

@original-brownbear Done! FYI, the full log is here (took me 7min)

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.

3 participants