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

DOC: Modify exe-bit for SECURITY.md #959

Merged
merged 1 commit into from
Nov 10, 2023

Conversation

KetilN
Copy link
Contributor

@KetilN KetilN commented Nov 5, 2023

Resolves #950.

Copy link
Collaborator

@mferrera mferrera left a comment

Choose a reason for hiding this comment

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

👍 You'll need to merge the updated main into your branch before this can be merged:

git pull upstream main
git rebase upstream/main  # while in your fix-exe.. branch
git push origin --force-with-lease

@mferrera mferrera self-requested a review November 6, 2023 16:00
Copy link
Collaborator

@mferrera mferrera left a comment

Choose a reason for hiding this comment

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

We need to ensure the merge commit that is created when you click the button is not merged into main, it should be rebased

@KetilN
Copy link
Contributor Author

KetilN commented Nov 6, 2023

We need to ensure the merge commit that is created when you click the button is not merged into main, it should be rebased
So then I do a "git pull upstream main" after the "merge branch" is done then.

@KetilN KetilN self-assigned this Nov 6, 2023
@KetilN KetilN force-pushed the fix-exe-bit-security-md branch from be1020a to fffa676 Compare November 9, 2023 22:30
@KetilN
Copy link
Contributor Author

KetilN commented Nov 9, 2023

Had to adjust the procedure slightly:

Via GITHUB: merge from equinor/xtgeo-->main to KetilN/xtgeo-->fix-exe-bit-security-md
git pull origin fix-exe-bit-security-md
git rebase -i HEAD~35 # while in your fix-exe.. branch --- Put the fixed commit message on top
git push -f origin HEAD:fix-exe-bit-security-md

@codecov-commenter
Copy link

Codecov Report

Merging #959 (fffa676) into main (013dc03) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #959   +/-   ##
=======================================
  Coverage   80.30%   80.30%           
=======================================
  Files          92       92           
  Lines       13494    13494           
  Branches     2227     2227           
=======================================
  Hits        10837    10837           
  Misses       1930     1930           
  Partials      727      727           

📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today!

@mferrera mferrera self-requested a review November 10, 2023 05:35
Copy link
Collaborator

@mferrera mferrera left a comment

Choose a reason for hiding this comment

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

👍 thanks!

@KetilN KetilN merged commit ade7672 into equinor:main Nov 10, 2023
26 checks passed
@KetilN KetilN deleted the fix-exe-bit-security-md branch November 10, 2023 09:52
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.

Fix file permissions for SECURITY.md
3 participants