-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
fix(web): some style edited #1529
Conversation
652c080
to
e48bb6c
Compare
...oog. I just made that comment in #1530 about "maybe transmission-app.js shouldn't be in the repo, since it's a generated file" and then came straight into here and see that conflict. Yeah, we're going to have conflicts in that file pretty much every time there are two in-flight web client PRs, aren't we. PR itself looks good. I like these improvements & I appreciate the feedback on the UI redesign. 👍 |
@ckerr I appreciate your feedback.
I agree with you. I think build result should not be tracked by git and saved in the repo. Anyhow, if you want me to eliminate transmission-app.js from this PR, I'll make the change. |
@trainto Perhaps the We can do this by creating a
You may well ask what the conflict policy will be now, same as for binaries, the newest will win, which I believe is what we want here. Reference: Managing generated files in GitHub |
@egroenen Thank you for sharing this info. I didn't know there is this kind of functionality in Git. I'll try to add .gitattributes and update this PR. |
Since transmission-app.js is a generated file, should be treated as a binary to avoid conflict.
I know how long this PR has been in limbo and am going through PRs to try to reduce the project's PR backlog. @trainto if you'd still like to see this PR land, please update it to resolve the merge conflicts and I'll merge it. Thanks! |
bb4ee9c
8bed360
--color-fg-on-popup added, and applied to overflow menu, and dialogs.