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

regular update based on user feedback #1188

Merged
merged 44 commits into from
Apr 10, 2024
Merged

regular update based on user feedback #1188

merged 44 commits into from
Apr 10, 2024

Conversation

gfursin
Copy link
Contributor

@gfursin gfursin commented Apr 5, 2024

No description provided.

@gfursin gfursin requested a review from a team as a code owner April 5, 2024 16:53
Copy link

github-actions bot commented Apr 5, 2024

MLCommons CLA bot All contributors have signed the MLCommons CLA ✍️ ✅

@gfursin
Copy link
Contributor Author

gfursin commented Apr 6, 2024

@pgmpablo157321
Hi Pablo,
Somehow some of my commits are not from my ID (gfursin) but from the ID of my organization (@ctuning) . I signed CLA under @gfursin using my organization (@ctuning) - is it possible to add @ctuning to the CLA too please?
Thanks a lot!

@nathanw-mlc
Copy link
Member

is it possible to add @ctuning to the CLA too please? Thanks a lot!

Hey Grigori, if you fill out the MLCommons Subscription Form with admin@cTuning.org as the email address and ctuning as the GitHub ID, our automation system should handle that request and put @ctuning on the CLA list.

@gfursin
Copy link
Contributor Author

gfursin commented Apr 8, 2024

is it possible to add @ctuning to the CLA too please? Thanks a lot!

Hey Grigori, if you fill out the MLCommons Subscription Form with admin@cTuning.org as the email address and ctuning as the GitHub ID, our automation system should handle that request and put @ctuning on the CLA list.

Hi Nathan,
Thank you for the update - I just signed the CLA with admin@cTuning.org & ctuning GitHub ID and confirmed email.
Please tell me when it is processed and I will retry this PR ...
Have a good week,
Grigori

@nathanw-mlc
Copy link
Member

nathanw-mlc commented Apr 8, 2024

@gfursin Please tell me when it is processed and I will retry this PR.

The system added @ctuning to the CLA list. However, the CLA checker is still failing. Did you perhaps make the commits attributed to @ctuning with Git and not set up Git to use the email address associated with a GitHub user?

@gfursin
Copy link
Contributor Author

gfursin commented Apr 9, 2024

@gfursin Please tell me when it is processed and I will retry this PR.

The system added @ctuning to the CLA list. However, the CLA checker is still failing. Did you perhaps make the commits attributed to @ctuning with Git and not set up Git to use the email address associated with a GitHub user?

Hmm, may I did that by accident. I see just one commit with cTuning (also maybe capital T is the problem). I think the easiest is to remove this commit but I need to figure out how to do it - I didn't do that before ;) ... Suggestions are welcome! Thank you!

@nathanw-mlc
Copy link
Member

Hey Grigori, here are some instructions provided by GPT4:

Step 1: Identify the Commit to Remove

First, identify the commit SHA (hash) of the commit you wish to remove. You can do this by looking at the commit history on GitHub or using the command line:

git log --oneline

Step 2: Rebase the Branch Interactively

Next, you’ll want to rebase the branch associated with the PR interactively, starting from a commit before the one you wish to remove. If the commit is relatively recent, you can do something like:

git rebase -i HEAD~X

X is the number of commits to include in the rebase. Choose a number that includes the commit you want to remove and earlier commits.

Step 3: Drop the Commit

In the interactive rebase UI (which will open in your default terminal text editor), you'll see a list of commits from oldest to newest. Each commit will start with the word pick. To remove a commit, change the word pick to drop for the commit you want to remove. Save and close the editor to start the rebase.

Step 4: Resolve Any Conflicts

If there are conflicts during the rebase, git will stop and allow you to fix them. Once resolved, use git rebase --continue to proceed. Repeat as necessary until the rebase is complete.

Step 5: Force Push the Changes

After successfully rebasing and removing the unwanted commit, you'll need to update the branch on GitHub. Because you've altered the commit history, a standard push won’t work. You'll need to force push:

git push origin HEAD --force

Using a New Branch

If you prefer to avoid altering the history of the current PR branch directly (for example, if the PR has been extensively reviewed and you don't want to disrupt the existing discussion), you can create a new branch from the current state, remove the commit there, and then merge the new branch into the original PR branch (after removing the commit) and then force push the original branch.

@gfursin
Copy link
Contributor Author

gfursin commented Apr 10, 2024

Hey Grigori, here are some instructions provided by GPT4:

Step 1: Identify the Commit to Remove

First, identify the commit SHA (hash) of the commit you wish to remove. You can do this by looking at the commit history on GitHub or using the command line:

git log --oneline

Step 2: Rebase the Branch Interactively

Next, you’ll want to rebase the branch associated with the PR interactively, starting from a commit before the one you wish to remove. If the commit is relatively recent, you can do something like:

git rebase -i HEAD~X

X is the number of commits to include in the rebase. Choose a number that includes the commit you want to remove and earlier commits.

Step 3: Drop the Commit

In the interactive rebase UI (which will open in your default terminal text editor), you'll see a list of commits from oldest to newest. Each commit will start with the word pick. To remove a commit, change the word pick to drop for the commit you want to remove. Save and close the editor to start the rebase.

Step 4: Resolve Any Conflicts

If there are conflicts during the rebase, git will stop and allow you to fix them. Once resolved, use git rebase --continue to proceed. Repeat as necessary until the rebase is complete.

Step 5: Force Push the Changes

After successfully rebasing and removing the unwanted commit, you'll need to update the branch on GitHub. Because you've altered the commit history, a standard push won’t work. You'll need to force push:

git push origin HEAD --force

Using a New Branch

If you prefer to avoid altering the history of the current PR branch directly (for example, if the PR has been extensively reviewed and you don't want to disrupt the existing discussion), you can create a new branch from the current state, remove the commit there, and then merge the new branch into the original PR branch (after removing the commit) and then force push the original branch.

Thank you @nathanw-mlc . However, eventually, we found a simpler solution (thanks to @arjunsuresh). I added ctuning-admin user and updated the GitHub ID from ctuning to ctuning-admin for the MLCommons CLA and it worked. Normally this should avoid our issues in the future when committed via ctuning. Thanks again for your help!

@arjunsuresh arjunsuresh merged commit 7c918fc into master Apr 10, 2024
37 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Apr 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants