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

Update .gitignore and .editorconfig #3886

Merged
merged 2 commits into from
Jan 20, 2020
Merged

Conversation

cbeams
Copy link
Contributor

@cbeams cbeams commented Jan 10, 2020

This PR introduces two non-code related changes:

368f0ad7f (Chris Beams, 5 weeks ago)
   Ignore Structure101 Workspace files

   In the refactorings that will follow, Structure101 Studio and the
   Structure101 Workspace IDEA plugin will be used to visualize and help
   resolve tangles in the codebase. We were already ignore Studio
   configuration files which end in .java.hsb, and this commit ignores the
   newer Workspace product's .java.hsw files as well.

b4ee9d33e (Chris Beams, 3 weeks ago)
   Do not strip trailing whitespace in Git diffs

   Problem: Editorconfig was configured to strip trailing whitespace in all
   file types. This is generally a good thing, but when interactive rebasing
   with Git and editing the contents of a commit, trailing whitespace is
   significant on blank lines and must be preserved in order for edits to be
   applied cleanly.

   Solution: Update Editorconfig to exclude *.diff from the strip whitespace
   rule, as interactive rebasing edits are done in a temporary file with a
   '.diff' suffix.

Note that this is the first in a series of PRs that lead up to a larger refactoring effort. As each subsequent PR is submitted it will reference the PR that comes before it, creating a chain.

Problem: Editorconfig was configured to strip trailing whitespace in all
file types. This is generally a good thing, but when interactive
rebasing with Git and editing the contents of a commit, trailing
whitespace is significant on blank lines and must be preserved in order
for edits to be applied cleanly.

Solution: Update Editorconfig to exclude *.diff from the strip
whitespace rule, as interactive rebasing edits are done in a temporary
file with a '.diff' suffix.
In the refactorings that will follow, Structure101 Studio and the
Structure101 Workspace IDEA plugin will be used to visualize and help
resolve tangles in the codebase. We were already ignore Studio
configuration files which end in .java.hsb, and this commit ignores the
newer Workspace product's .java.hsw files as well.
Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

Copy link
Member

@sqrrm sqrrm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@sqrrm sqrrm merged commit b1cabe3 into bisq-network:master Jan 20, 2020
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.

3 participants