Skip to content

Conversation

xukai92
Copy link
Member

@xukai92 xukai92 commented Apr 17, 2024

Changes

Description of your changes:
Added a demo badge to the repo with link to the demo.

Sharing MD slides used for https://asciinema.org/a/PmRU7IrReep04FY6qpzo2Zclc.
Tested with https://github.com/maaslalani/slides.git

Copy link
Member

@russellb russellb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great demo!

Copy link
Member

@russellb russellb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please rebase your branch on main first, though?

In general, I recommend just rebasing your branches instead of merging main back into your branch.

@xukai92
Copy link
Member Author

xukai92 commented Apr 17, 2024

just rebased. i shouldn't click the GH conflict resolve button!

@russellb
Copy link
Member

Thanks for rebasing. I would squash all of the commits into one. We don't need to keep "resolve conflicts" commits.

@anik120
Copy link
Contributor

anik120 commented Apr 18, 2024

What happened to the "squash and merge" button? I only see a "Merge pull request" now, when did we change that? 😄

Signed-off-by: Kai Xu <xuk@ibm.com>
@xukai92
Copy link
Member Author

xukai92 commented Apr 18, 2024

squashed

@anik120 anik120 merged commit fe12bd0 into instructlab:main Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants