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

gitbutler/integration #22

Merged
merged 1 commit into from
Mar 11, 2024
Merged

gitbutler/integration #22

merged 1 commit into from
Mar 11, 2024

Conversation

piotrkulpinski
Copy link
Contributor

  • GitButler Integration Commit
  • add basic pricing plan component and update focus classes

This is an integration commit for the virtual branches that GitButler is tracking.

Due to GitButler managing multiple virtual branches, you cannot switch back and
forth between git branches and virtual branches easily. 

If you switch to another branch, GitButler will need to be reinitialized.
If you commit on this branch, GitButler will throw it away.

Here are the branches that are currently applied:
 - Add status component and variants (refs/gitbutler/Add-status-component-and-variants)
   - src/ui/Alert/Alert.stories.tsx
   - src/ui/Button/Button.variants.ts
   - src/shared/classes.ts
   - src/layout/Wrapper/Wrapper.variants.ts
   - src/ui/Plan/Plan.tsx
   - src/ui/Modal/Modal.variants.ts
   - src/ui/Plan/Plan.variants.ts
   - tailwind.config.ts
   - src/styles/tailwind.css
   - src/index.ts
   - src/ui/Plan/Plan.stories.tsx
   - src/ui/Alert/Alert.tsx
   - src/ui/Plan/index.ts
 - Add tailwind and Chromatic CI
 (refs/gitbutler/Add-tailwind-and-Chromatic-CI-)
   branch head: bb864771e1c4b08c39d6404ff65c64d6f0a4edaa

Your previous branch was: refs/heads/main

The sha for that commit was: 4638343

For more information about what we're doing here, check out our docs:
https://docs.gitbutler.com/features/virtual-branches/integration-branch
@piotrkulpinski piotrkulpinski force-pushed the gitbutler/integration branch from 0fe9530 to 9ab4f2a Compare March 11, 2024 15:16
@piotrkulpinski piotrkulpinski merged commit 9a7e525 into main Mar 11, 2024
@piotrkulpinski piotrkulpinski deleted the gitbutler/integration branch March 11, 2024 15:17
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.

2 participants