Boost us back to 2025 in the footer after having it lost during merge conflict resolving #2183
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lving I believe it happened in #2135 while resolving conflict merges in 700abad . See git diff 700abad^2..700abad -- web/src/components/DandiFooter.vue Also it includes auto-removal of useless trailing spaces done by pre-commit to that file [INFO] This may take a few minutes... trim trailing whitespace.................................................Failed - hook id: trailing-whitespace - exit code: 1 - files were modified by this hook Fixing web/src/components/DandiFooter.vue
yarikoptic
added
UX
Thanks. I will use it in the future. |
waxlamp
approved these changes
Feb 19, 2025
waxlamp
added
release
|
🚀 PR was released in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I felt odd when saw 2024 back online, while seeing #2144 merged and released. It also took a bit to track it down since apparently
git log -pdoes not show merges, and here I believe it happened in #2135 while resolving conflict merges in 700abad .See
To at least partially assist and annotate merges which were problematic and how, I have in my
~/.gitconfigand then when I do merge locally I get commented out section listing conflicted files, which I uncomment and add description on why conflict and how was handled. See e.g. dandi/dandi-cli@1948866 . Might be worth adopting IMHO.
Also this commit/PR includes auto-removal of useless trailing spaces done by pre-commit to that file
@kabilar do you have pre-commit enabled for your local clone?