Skip to content

feat: add attendee B Logrono#10

Open
d1w1rm4 wants to merge 1 commit intoup-csi:mainfrom
d1w1rm4:add-attendee
Open

feat: add attendee B Logrono#10
d1w1rm4 wants to merge 1 commit intoup-csi:mainfrom
d1w1rm4:add-attendee

Conversation

@d1w1rm4
Copy link
Copy Markdown

@d1w1rm4 d1w1rm4 commented Nov 29, 2023

Added attendees from Brylle's laptop

Comment thread README.md
Comment on lines +7 to +9
Brylle Logrono
Harold Antonio
David Zamuco
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Almost there! We just need to use bullets here.

Suggested change
Brylle Logrono
Harold Antonio
David Zamuco
* Brylle Logrono
* Harold Antonio
* David Zamuco

@BastiDood
Copy link
Copy Markdown
Contributor

Almost there! Note that your branch now conflicts with the upstream main branch. We just need to resolve them.

  1. Sync the main branch of the fork.
  2. Switch to the feature branch.
  3. Run git merge main to incorporate the latest changes from main into our feature branch.
  4. Resolve the merge conflicts manually.
  5. Create a new commit for the merge resolution.
  6. Push the commits to the upstream feature branch.

This PR should update automatically for each new push.

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