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

Enhance (dev) #10981

Open
wants to merge 19 commits into
base: feat/db
Choose a base branch
from
Open

Enhance (dev) #10981

wants to merge 19 commits into from

Conversation

sprocketc
Copy link
Collaborator

@sprocketc sprocketc commented Feb 6, 2024

  • Remove index.html duplicates
  • 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

@github-actions github-actions bot added the :type/enhancement Enhancement to product. Does not affect the overall basic use. label Feb 6, 2024
@sprocketc sprocketc changed the title [WIP] Enhance (dev) Enhance (dev) Feb 26, 2024
@sprocketc sprocketc marked this pull request as ready for review February 26, 2024 09:56
@xyhp915
Copy link
Collaborator

xyhp915 commented Feb 27, 2024

Is it more appropriate to merge this PR into the master branch?

@sprocketc
Copy link
Collaborator Author

@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)

@xyhp915
Copy link
Collaborator

xyhp915 commented Feb 27, 2024

@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.
PS: I think it may take some time for the development on the db branch to be merged into the master branch 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:type/enhancement Enhancement to product. Does not affect the overall basic use.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants