Skip to content

Conversation

@andrey4latyshev
Copy link
Contributor

Clang format check will be performed on the CI side, not in this repository

@anjgola
Copy link
Contributor

anjgola commented Jul 27, 2020

Typically when a file is removed I expect to see a diff of the file being removed under 'Files Changed' tab. I think this is happening because your branch does not know that the file is added to master so it cannot detect that it is being deleted and there is nothing showing in the net delta of this commit. I think there is a chance that this commit sequence will not remove the file.

To fix this, we first need to inform your branch that this file exists on master.. This can be done by first syncing your fork's master with the remote fork's master. Please use the section titled 'Sync fork and upstream repository
' at https://github.com/oneapi-src/oneAPI-samples/wiki/Git-Steps-for-Contribution to update your fork's master first. The PR should get automatically updated after that.

Copy link
Contributor

@JoeOster JoeOster left a comment

Choose a reason for hiding this comment

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

approving to kick off ci

@andrey4latyshev
Copy link
Contributor Author

Typically when a file is removed I expect to see a diff of the file being removed under 'Files Changed' tab. I think this is happening because your branch does not know that the file is added to master so it cannot detect that it is being deleted and there is nothing showing in the net delta of this commit. I think there is a chance that this commit sequence will not remove the file.

To fix this, we first need to inform your branch that this file exists on master.. This can be done by first syncing your fork's master with the remote fork's master. Please use the section titled 'Sync fork and upstream repository
' at https://github.com/oneapi-src/oneAPI-samples/wiki/Git-Steps-for-Contribution to update your fork's master first. The PR should get automatically updated after that.

Thanks Anjali! Done.

@anjgola
Copy link
Contributor

anjgola commented Jul 27, 2020

Still not seeing a delta. I am going to try and merge this and see if it actually removes the file.

@anjgola anjgola merged commit d535bed into oneapi-src:master Jul 27, 2020
@anjgola
Copy link
Contributor

anjgola commented Jul 27, 2020

Nope, it doesn't work. Here is why : https://github.com/andrey4latyshev/oneAPI-samples/tree/clang-format-check. In this branch the script file is still there. You need to remove the file from there and create a PR again.

jimmytwei pushed a commit to jimmytwei/oneAPI-samples that referenced this pull request Mar 29, 2023
Update chapter 2 examples to align with next edition of the book
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.

4 participants