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

Git: fix submodules whitespace #1910

Merged
merged 1 commit into from Sep 9, 2019

Conversation

@kubark42
Copy link
Contributor

commented Sep 9, 2019

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.

Problem

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 device-os releases.

Solution

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

Completeness

  • User is totes amazing for contributing!
  • Contributor has signed CLA (Info here)
  • Problem and Solution clearly stated
  • Run unit/integration/application tests on device
  • Added documentation
  • Added to CHANGELOG.md after merging (add links to docs and issues)
@avtolstoy

This comment has been minimized.

Copy link
Member

commented Sep 9, 2019

@kubark42 Thanks for submitting!

I'm not entirely sure how an indentation change in .gitmodules would cause conflicts, but since this was anyway an unintended change let's fix it 👍

Would you please sign the CLA in order for us to accept this PR?

@avtolstoy

This comment has been minimized.

Copy link
Member

commented Sep 9, 2019

Your branch is also out of date with the current develop and needs to be correctly rebased on it, in order to be merged.

@kubark42

This comment has been minimized.

Copy link
Contributor Author

commented Sep 9, 2019

I'm not entirely sure how an indentation change in .gitmodules would cause conflicts, but since this was anyway an unintended change let's fix it 👍

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 git is that whitespace causes some of the most hard-to-resolve conflicts. Being pretty aggressive about squashing any whitespace changes my IDE introduces has really reduced my stress level when tracking upstream projects.

Would you please sign the CLA in order for us to accept this PR?

Done! (although whitespace changes are specifically not protected by copyright. ;)

@avtolstoy avtolstoy added this to the 1.4.0 milestone Sep 9, 2019

@avtolstoy

This comment has been minimized.

Copy link
Member

commented Sep 9, 2019

Done!

Thanks!

Thanks for the prompt attention, think it can get in before 1.4.0 release?

Yes, this will get into 1.4.0.

@avtolstoy

This comment has been minimized.

Copy link
Member

commented Sep 9, 2019

@kubark42 I see you've merged develop into your branch instead. This is not something we normally do and instead rebase on develop to keep the commit history linear.

@kubark42

This comment has been minimized.

Copy link
Contributor Author

commented Sep 9, 2019

@kubark42 I see you've merged develop into your branch instead. This is not something we normally do and instead rebase on develop to keep the commit history linear.

Ah, I thought you wanted me to click the "Update branch" button on github's page. I literally forked device-os minutes before making the submission, and it looks like there's already another change since the PR opened. You guys move fast! 👍

So what would you like me to do? I'm happy to rebase --onto so that this individual commit is at the top of the stack.

Git: fix submodules whitespace
Whitespace changes were introduced in commit
504114b. As a result, these changes cause
merge conflicts with feature branches. This commit removes those so that
merges are clean again.

@kubark42 kubark42 force-pushed the kubark42:fix_gitmodules_whitespace branch from bcfb607 to 3800c7a Sep 9, 2019

@avtolstoy avtolstoy merged commit d39ab19 into particle-iot:develop Sep 9, 2019

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@avtolstoy

This comment has been minimized.

Copy link
Member

commented Sep 9, 2019

Merged!

@kubark42 kubark42 deleted the kubark42:fix_gitmodules_whitespace branch Sep 9, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.