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

Update example #288

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Conversation

GuillaumeMercier
Copy link
Collaborator

No description provided.

Signed-off-by: Guillaume Mercier <[email protected]>
@GuillaumeMercier
Copy link
Collaborator Author

GuillaumeMercier commented Nov 6, 2024

I issued the commands to fix the whitespace issue and it doesn't seem to be taken into account by github. I don't know to solve this issue.

Run these commands to correct the problem:
1. `git rebase --whitespace=fix dd0c7a1`
2. `git push --force`

And in my terminal:

>  git rebase --whitespace=fix dd0c7a1
First, rewinding head to replay your work on top of it...
Applying: Update example

> git push --force 
Enumerating objects: 11, done.
Counting objects: 100% (11/11), done.
Delta compression using up to 8 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 1.78 KiB | 1.78 MiB/s, done.
Total 6 (delta 5), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (5/5), completed with 5 local objects.
To github.com:hpc/quo-vadis.git
 + 57bc105...3ffa6c4 color_array_pt2 -> color_array_pt2 (forced update)

@samuelkgutierrez samuelkgutierrez merged commit d331c8a into hpc:master Nov 6, 2024
2 of 4 checks passed
@samuelkgutierrez
Copy link
Member

Master is now broken. Please fix.

GuillaumeMercier added a commit that referenced this pull request Nov 6, 2024
@GuillaumeMercier
Copy link
Collaborator Author

This issue is that I did not push the changes in the right branch!
Sorry about that. Master should be fixed now. See #290

@samuelkgutierrez
Copy link
Member

Thank you, @GuillaumeMercier.

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