Skip to content

PEP-8 Reformat#2

Merged
HadManySons merged 3 commits intoHadManySons:masterfrom
Travis42:master
Jun 8, 2017
Merged

PEP-8 Reformat#2
HadManySons merged 3 commits intoHadManySons:masterfrom
Travis42:master

Conversation

@Travis42
Copy link
Copy Markdown
Contributor

@Travis42 Travis42 commented Jun 6, 2017

Can you appreciate the irony of a program designed to provide AFIs getting cited for a PEP 8 'violation'? :)

I wanted to read your code, and while doing so, thought it would be better if formatted according to PEP 8. So here you go:

@HadManySons
Copy link
Copy Markdown
Owner

HadManySons commented Jun 6, 2017

Yeah, I cut my teeth in C++, so the idea of using spaces instead of tabs almost makes me sick. I'll admit that I haven't looked into PEP-8 very much. Let me do some testing on it and then I'll probably pull it in.

Question though, there two commits here, which one is correct?

@Travis42
Copy link
Copy Markdown
Contributor Author

Travis42 commented Jun 6, 2017

The most recent one. I think its saying there are conflicts because the pull request before mine that you recently merged changes around a few lines of code.

I'm a bit new to github collaboration.

@HadManySons
Copy link
Copy Markdown
Owner

Yeah, I figured it would create a conflict, but that's okay, its an opportunity to learn about conflict resolution now. I am also new to GitHub collab. I'll let you know when I get a chance to review it all and test it. I'm sure it works fine, but I want triple check everything before I merge it in.

@HadManySons
Copy link
Copy Markdown
Owner

Also, is that a flight suit and a morale shirt I see in your profile pic? What do you do? PM me on reddit if you don't want to answer here: /u/hadmanysons

@Travis42
Copy link
Copy Markdown
Contributor Author

Travis42 commented Jun 6, 2017

EWO, RC-135. You?

@Travis42
Copy link
Copy Markdown
Contributor Author

Travis42 commented Jun 6, 2017

Yep...must have been a Friday when that photo was taken. :)

@HadManySons
Copy link
Copy Markdown
Owner

C-130H FE

@HadManySons
Copy link
Copy Markdown
Owner

Everything appears to functions the same, merging.

@HadManySons HadManySons merged commit 41ed8da into HadManySons:master Jun 8, 2017
@HadManySons
Copy link
Copy Markdown
Owner

Had to commit it again, apparently a colon got dropped from an else statement even though I tested the code. I only noticed after I committed this pull request and then cloned the code and ran it. Weird, since it ran fine if I copy-pasted the code out of the browser.

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