Skip to content

fixed some ui bugs and adjusted it to more markdown focused - #35

Merged
saoshreyas merged 1 commit into
elmisback:working-Annotation-Generatorfrom
ansoncchen:working-Annotation-Generator
Apr 20, 2026
Merged

fixed some ui bugs and adjusted it to more markdown focused#35
saoshreyas merged 1 commit into
elmisback:working-Annotation-Generatorfrom
ansoncchen:working-Annotation-Generator

Conversation

@ansoncchen

Copy link
Copy Markdown

fixed the general code annotator issues especially with editing, shifted out of baseline react to simpler markdown focused code annotation generation

@elmisback

Copy link
Copy Markdown
Owner

Hi @ansoncchen, thank you for your contribution!

@saoshreyas so we are in a kind of messy state here. This is your branch, so it's up to you to merge forks into that if you want to. I will review at the point when elmisback:working-Annotation-Generator is ready to merge into main. That said, when you go to merge work back into main, you will need to bring the work up to date with main. main has diverged in a couple of ways by now:

  1. tools.tsx should be a short file with canonical, known-working simple examples. Please keep your work in the new additionalTools.tsx or files that are imported from that file!
  2. Some components, like the new Markdown Notes tool, have replaced older versions of those ideas, and it's not useful to iterate on the older versions.

So @saoshreyas I think the takeaway is: please bring your branch up to date with main and keep it there! In other words, if you look at this page https://github.com/elmisback/magic-markup/tree/working-Annotation-Generator, you should not see this message about being N commits behind main:
image

To accomplish this, you can try pulling in main and seeing how it goes, but if that creates a bunch of conflicts you aren't sure how to resolve, I would personally just make a new branch off of main and copy your changes into the relevant parts of additionalTools.tsx. Note I did make a couple changes to the annotation generator when I was hacking around on the system video.

@saoshreyas
saoshreyas merged commit d341ce0 into elmisback:working-Annotation-Generator Apr 20, 2026
@github-project-automation github-project-automation Bot moved this from Todo to Done in Codetations development Apr 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

3 participants