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

Libraries page #5480

Merged
merged 1 commit into from
Nov 3, 2024
Merged

Libraries page #5480

merged 1 commit into from
Nov 3, 2024

Conversation

DIANAAJAMBO
Copy link
Contributor

I added an image that compares native instrumentation and instrumentation libraries to enhance the explanation in the "Libraries" section.
I designed the image using figma and then added it to the images folder under "static" folder.
This was in relation to issue #5355

@svrnm
Copy link
Member

svrnm commented Oct 25, 2024

@DIANAAJAMBO this PR still contains changes to the registry, can you double check?

@DIANAAJAMBO
Copy link
Contributor Author

@DIANAAJAMBO this PR still contains changes to the registry, can you double check?

@svrnm I made an error to work with the main branch from the start. So when i created a branch from my main, it came with all my past commits. I realize i should have kept one original branch without any commits and worked with the sub branches for both contributions.

@svrnm
Copy link
Member

svrnm commented Oct 25, 2024

@DIANAAJAMBO this PR still contains changes to the registry, can you double check?

@svrnm I made an error to work with the main branch from the start. So when i created a branch from my main, it came with all my past commits. I realize i should have kept one original branch without any commits and worked with the sub branches for both contributions.

You still should be able to fix that, it's just some work. What I often do in such a situation is the following:

  • Copy all changes you have done out of the repository folder, so that you have saved them
  • Reset your main branch to be in sync with upstream (open-telemetry/opentelemetry.io), github UI has some buttons for that where you can discard changes and get latest updates
  • Fetch those latest updates locally.
  • Create one new branch and add the files for your first PR, submit them
  • Go back to main branch
  • Create a second branch and add the files for your second PR, submit them

The habit you have to get into is having one branch per pull request, it's a learning curve but eventually it helps you to work on multiple things simultaneously.

@DIANAAJAMBO
Copy link
Contributor Author

@DIANAAJAMBO this PR still contains changes to the registry, can you double check?

@svrnm I made an error to work with the main branch from the start. So when i created a branch from my main, it came with all my past commits. I realize i should have kept one original branch without any commits and worked with the sub branches for both contributions.

You still should be able to fix that, it's just some work. What I often do in such a situation is the following:

  • Copy all changes you have done out of the repository folder, so that you have saved them
  • Reset your main branch to be in sync with upstream (open-telemetry/opentelemetry.io), github UI has some buttons for that where you can discard changes and get latest updates
  • Fetch those latest updates locally.
  • Create one new branch and add the files for your first PR, submit them
  • Go back to main branch
  • Create a second branch and add the files for your second PR, submit them

The habit you have to get into is having one branch per pull request, it's a learning curve but eventually it helps you to work on multiple things simultaneously.

This is very detailed. Thank you. Let me execute this.

@DIANAAJAMBO
Copy link
Contributor Author

Hello @svrnm , I’ve successfully fixed the commit history, so there’s now a single commit reflecting the changes to the libraries page. Thank you for the advice, it was a huge help!

@cartermp cartermp added this pull request to the merge queue Nov 2, 2024
Merged via the queue into open-telemetry:main with commit 9ce6556 Nov 3, 2024
17 checks passed
Copy link
Contributor

@chalin chalin left a comment

Choose a reason for hiding this comment

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

@DIANAAJAMBO: move the image added by this PR to content/en/docs/concepts/instrumentation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants