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

New file jquery.minicolors.png after update the branch #30442

Closed
yp05327 opened this issue Apr 12, 2024 · 2 comments · Fixed by #30451
Closed

New file jquery.minicolors.png after update the branch #30442

yp05327 opened this issue Apr 12, 2024 · 2 comments · Fixed by #30451
Labels
type/question Issue needs no code to be fixed, only a description on how to fix it yourself.

Comments

@yp05327
Copy link
Contributor

yp05327 commented Apr 12, 2024

Feature Description

After update the branch, I got this new file, is this an issue? or just ignore it?
image

Screenshots

No response

@yp05327 yp05327 added the type/question Issue needs no code to be fixed, only a description on how to fix it yourself. label Apr 12, 2024
@silverwind
Copy link
Member

silverwind commented Apr 12, 2024

The file is gone since #30055, but as it is not in .gitignore any more, it will show up if you build the 1.22 branch, switch to main and execute git add --all.

Either delete it manually or we re-add public/assets/img/webpack to gitignore.

@silverwind
Copy link
Member

I guess we can restore the gitignore entry with a comment like "remove after 1.22 goes EOL".

silverwind added a commit that referenced this issue Apr 13, 2024
Fixes #30442

It's inconvenient to have new untracked files show up in git when
switching to older branches that had generated them.

Introduce a list of such files and folders to gitignore and
dockerignore.
DennisRasey pushed a commit to DennisRasey/forgejo that referenced this issue Apr 16, 2024
Fixes go-gitea/gitea#30442

It's inconvenient to have new untracked files show up in git when
switching to older branches that had generated them.

Introduce a list of such files and folders to gitignore and
dockerignore.

(cherry picked from commit 68271834d6ae6d397b5a2048f9e515ff53735994)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
type/question Issue needs no code to be fixed, only a description on how to fix it yourself.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants