Skip to content

Changed merge parameters to ignore whitespace differences to make git merge more tolerant #34

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.

Sign up for GitHub

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

Jump to bottom
Merged
twpol merged 1 commit into from
Jan 16, 2022
Merged

Changed merge parameters to ignore whitespace differences to make git merge more tolerant #34

twpol merged 1 commit into from
Jan 16, 2022

Conversation

@Sharpe49
Copy link
Contributor

@Sharpe49 Sharpe49 commented Jan 14, 2022

No description provided.

@twpol
Copy link
Member

twpol commented Jan 16, 2022

Thanks for this!

@twpol twpol merged commit 658e220 into openrails:master Jan 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@twpol twpol twpol approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Sharpe49 @twpol