Skip to content

Update README.md - #24

Open
Vectorredz wants to merge 1 commit into
up-csi:mainfrom
Vectorredz:patch-1
Open

Update README.md#24
Vectorredz wants to merge 1 commit into
up-csi:mainfrom
Vectorredz:patch-1

Conversation

@Vectorredz

Copy link
Copy Markdown

I'm Louise Gabriel Vilar and I attended the Github workshop <3

@BastiDood BastiDood left a comment

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! 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.

Comment thread README.md
---
## Attendees

Louise Gabriel Vilar

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.

Added for consistency with other PRs.

Suggested change
Louise Gabriel Vilar
* Louise Gabriel Vilar

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