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.

Sign up for GitHub

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

feat(ci): updated to take compare fork image sample #114

Merged
merged 2 commits into from
Oct 20, 2023
Merged

feat(ci): updated to take compare fork image sample #114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6d61e2
updated to take compare fork image sample
aali309 Oct 20, 2023
ec36c3f
added missing images
aali309 Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,11 @@ $ git push -f origin some-task-branch # If already pushed to origin remote

Visit upstream repository and open a PR.


![visit-upstream](https://github.com/cryostatio/cryostat3/assets/56743004/5576c796-74b0-43f8-923f-5eb3f1a56e06)
![visit-upstream](https://github.com/cryostatio/cryostat3/assets/56743004/41bd424e-77be-4c30-8416-eb0a5d1c328f)

Compare changes across forks (your branch in fork to the upstream main).

to do once re-forked
<!--![select-compare-across-forks](https://user-images.githubusercontent.com/68053619/193328282-79d45b5e-097f-4995-ae21-51592dcf0bd4.jpg) -->
![select-compare-across-forks](https://github.com/cryostatio/cryostat3/assets/56743004/bbf311b6-98a7-47e3-a3c7-77b101ee4d3f)


Add:
Expand All @@ -105,16 +103,15 @@ Add:

**Note**: You might not be able to add reviewers and labels. Don't worry! The project team will add them accordingly.

to do once re-forked
<!--![prepare-pull-requests](https://user-images.githubusercontent.com/68053619/193328096-9df163d8-18ae-4978-b3c2-928ba4ad7872.jpg) -->
![prepare-pull-requests](https://github.com/cryostatio/cryostat3/assets/56743004/44019e86-1544-4cb0-ae58-61bd2ed6bb1b)

Once its done, you can click `Create Pull Request` and wait for approval.

![pull-requests-approved](https://github.com/cryostatio/cryostat3/assets/56743004/4ab55c01-2dc9-4959-ba43-036ca8ac44c8)

#### Result

Your changes will be get squashed into a single commit on `main` with the message including your PR title, and branch commit messages. From there, you can safely delete your branch.
Your changes will be squashed into a single commit on `main` with the message including your PR title, and branch commit messages. From there, you can safely delete your branch.

To delete:
```bash
Expand Down
Loading