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

fix line ending 😱 #114

Merged
merged 2 commits into from
Nov 5, 2019
Merged

fix line ending 😱 #114

merged 2 commits into from
Nov 5, 2019

Conversation

jetersen
Copy link
Member

@jetersen jetersen commented Nov 5, 2019

Fixed so line ending merge conflicts won't happen again.

by adding git attributes file this won't happen again.

@jetersen
Copy link
Member Author

jetersen commented Nov 5, 2019

thank goodness for git add --renormalize

@pjdarton
Copy link
Member

pjdarton commented Nov 5, 2019

I was going to comment that "on my local machine, everything seems to be CR-LF end-of-line codes" ... but then, it's possible that this was because my local machine is Windows and, when I started on this plugin, I wouldn't've known about gitattributes and how important they are 😁
Thanks for sorting this one - another bit of long-overdue-tech-debt resolved...

...I'll merge it once the automated build has checked that this hasn't upset anything.

@pjdarton
Copy link
Member

pjdarton commented Nov 5, 2019

...I'm impatient - the automated test has got past the build step and is just waiting for a maven executor for the deploy (which IME can take a while).
I'll merge it anyway.

@pjdarton pjdarton merged commit e81bbdb into jenkinsci:master Nov 5, 2019
@jetersen jetersen deleted the fix/lineending branch November 5, 2019 18:43
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