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

get_optics method added #3

Open
wants to merge 7 commits into
base: devel
Choose a base branch
from
Open

Conversation

hammerfiber
Copy link

Hey ckishimo,

I tried once more, in a number of ways, to get the CRLF/LF issue fixed to no avail. I'm not really sure what to do here. I see you've implemented a majority of my changes from my previous attempt at a PR (that suffered the same line ending issue).

Perhaps this PR can be merged, and we can figure out how to fix the line ending issue once both our repos are similar?

I've tested this get_optics() on both MLX and CER/CES platforms I have access to (everything is 5.8 or greater).

Thanks!

@ckishimo
Copy link
Owner

Thanks @hammerfiber !

Yeah, I waited some time and eventually I decided to implement the support for CES/CER

May I ask you to re-submit the PR against the devel branch I just created ? sorry I was not expecting contributions :-)

Not sure I understand the issue with CRLF/LF...so I'm happy to merge all the other changes but this one

Let me know

@hammerfiber
Copy link
Author

so despite my best efforts, no matter what I tell git, when I checkout netiron.py from your repo (or my fork) I get the "^M" line endings. that's why my pull request looks like a wholesale repeal/replace of your code.

what text editor/platform are you writing on?

@hammerfiber hammerfiber changed the base branch from master to devel October 23, 2017 15:49
@ckishimo
Copy link
Owner

I'm using Sublime on linux/ubuntu... AFAIK the "^M" line endings may appear if we mix linux/windows editors. I googled it and if you are developing in Windows, you may need to use git-config to fix that. Please have a look: https://stackoverflow.com/questions/1889559/git-diff-to-ignore-m

@aaglenn
Copy link

aaglenn commented Oct 25, 2017

I'm using nvi on openbsd. I added the core.autocrlf setting and rebuild the index but that did not work, as you can see.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants