Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
Git: fix submodules whitespace #1910
Whitespace changes to `.gitmodules` were (almost certainly accidentally) introduced in v.1.4.0-rc with https://github.com//pull/1864, via commit 504114b. As a result, these changes cause merge conflicts with feature branches. This commit removes those so that merges are clean again.
A change in 1.4.0-rc1 causes merge conflicts. This is important to fix before 1.4.0 goes live so that feature branch maintainers don't suffer needless headaches when targeting new
Removing the additional whitespace returns the file to the condition in https://github.com/particle-iot/device-os/tree/release/v1.3.1
Steps to Test
We have introduced some additional submodules in a feature branch, so the "whitespace changes" were where we have our "code changes" and git doesn't know how to sort them out. The upshot is that it barfs.
My experience with
Done! (although whitespace changes are specifically not protected by copyright. ;)
Ah, I thought you wanted me to click the "Update branch" button on github's page. I literally forked
So what would you like me to do? I'm happy to