added the if statement - Githubissues

adoptium / aqa-tests

Home of test infrastructure for Adoptium builds

https://adoptium.net/aqavit

Apache License 2.0

125 stars 304 forks source link

added the if statement #5341

Open Hana3706 opened 1 month ago

Hana3706 commented 1 month ago

solved the issue #5297 add a if statement

llxia commented 1 month ago

Please update the description to use https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword

Hana3706 commented 1 month ago

testenvSettings.sh should run only once

All four commits do the same thing, was a git mistake on my side

Fixed #5297 and #5341

signed-off-by: Hana hanazayed06@gmail.com

llxia commented 1 month ago

Thanks @Hana3706 for the update. However, the code does not match the suggested https://github.com/adoptium/aqa-tests/pull/5341#discussion_r1608685076 Also, please do not include other changes that are unrelated to this issue. Thanks

Hana3706 commented 1 month ago

@llxia am so sorry for this but can you point out to me how it doesn't match the code bcs on my local computer the code is updated to match the suggested changes, perhaps there was an issue with the version I commit...

LongyuZhang commented 1 month ago

Hi @Hana3706 Usually you can rebase to keep the PR up-to-date with the upstream repo. For your current case, it might be easier to create a new branch with the following steps:

make a copy of current branch (git checkout -b <new_branch_1>)
checkout your master branch, fetch upstream, then rebase it to the latest
Delete your current branch my_new_branch locally, then re-create new my_new_branch from master
Make the changes (you can refer previous copied branch ), commit and force push, then this PR will be updated.

Hana3706 commented 1 month ago

@LongyuZhang thanks a lot for the feedback! I was just wondering why I need to create a new branch? As well as that, I want to better understand what is wrong with the update I made so I can fix it again. Finally, how do I rebase to the latest branch upstream and how do I delete a branch locally... am so sorry for the many questions :) thanks again!

LongyuZhang commented 1 month ago

@Hana3706 If you can rebase on the currently branch, it would be great. I suggested re-create new branch since you commits may already mixed with merged commits. So feel free to try rebase on this branch first. Regarding the rebase, you can follow https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-repository-for-a-fork to add adoptium/aqa-tests as the upstream, fetch it to your local, then use git rebase upstream/master command to update your branch.