search

ady624 / webCoRE

webCoRE is a web version of CoRE
GNU General Public License v3.0
251 stars 984 forks source link

Updates for HE #78

Closed imnotbob closed 5 years ago

idpaterson commented 5 years ago

Just to confirm, can #77 be closed? It looks like #78 might be the same thing but without the conflicting line endings but I can't tell for sure. If so that's great, I'll just close #77 and review this one.

idpaterson commented 5 years ago

Hmm no they're not the same, at a glance #78 includes updates for fuel streams as well. I'm going to need more to go on for these than "Updates for HE" if you would please describe what has changed.

imnotbob commented 5 years ago

three files are changed, I gave you three pull requests.

77 covers fuel streams 78 is for access tokens and running rules 79 is for UI display (piston execute)

imnotbob commented 5 years ago

77 and 79 are big because git wanted to fix end of lines (actually small changes)

imnotbob commented 5 years ago

I have all pull requests in (3)

idpaterson commented 5 years ago

I need one pull request including all files that need to be changed for HE compatibility and with changes on only the lines that were intentionally modified, please. #77 and #79 are not acceptable since the diffs include thousands of line ending changes that make it impossible to determine what actually changed; please commit those files without the line ending issues to pull request #78. I provided a cleaned diff for #77 to help you out but I can't keep fielding these pull requests for individual files.

Additional commits to your patch-5 branch should automatically be included in #78.