-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Enhance (dev) #10981
base: feat/db
Are you sure you want to change the base?
Enhance (dev) #10981
Conversation
sprocketc
commented
Feb 6, 2024
•
edited
edited
- Remove index.html duplicates
- Reverted 8c84a26 because I couldn't properly test mobile and sentry sourcemap issues (see fix(build): sourcemap in release #4710), but I think this needs to be done.
- Reintroduce css live reload on electron
- Remove react deps from repo 9f6f540
- Remove glide resources from repo 4aae2c1 (see handbook to QA)
- Enhance tabler-icons resource handling f8ac251
- Fix css regressions on whiteboards 84becc8 dd80256
Is it more appropriate to merge this PR into the master branch? |
@xyhp915 Hello! I don't mind changing the target branch, but I don't think it matters much in this case, since this mostly consists of dev related changes. Also see #10906 (comment) |
Hi! Yes, I roughly understand your point. My main concern is the conflict issue because the db branch has been kept in sync with the master branch all along, and #10906 previously caused some difficult-to-handle conflicting files. However, not many files are involved in this PR currently, so merging from the master to the db branch may not be a problem. |