search

lspestrip / striptease

Strip TEst Analysis for System Evaluation
MIT License
4 stars 3 forks source link

Update the waittime script #99

Closed lopezcaraballoch closed 1 year ago

lopezcaraballoch commented 1 year ago

Fix the bugs in the print commands.

ziotom78 commented 1 year ago

Hi Carlos, I fixed a small conflict. Is the code ready to be merged now?

lopezcaraballoch commented 1 year ago

Yes, in principle yes. On June 20, I wrote to you: Hola Maurizio,

To me, it is fine. You can merge the PR. I used print to save the report because I followed your video; from now, I will use out.write.

I have a question about GitHub. When you merge it, are you merge the branch or are you move the code to the main branch and delete the branch ? Then, I need synchronize my fork w.r.t. the main original branch, right?

PD: Sorry, I could not answer before because I was on vacation (from June 15 to yesterday).

Regards, Carlos

ziotom78 commented 1 year ago

To me, it is fine. You can merge the PR. I used print to save the report because I followed your video; from now, I will use out.write.

Great, thank you! I merged the PR

I have a question about GitHub. When you merge it, are you merge the branch or are you move the code to the main branch and delete the branch ? Then, I need synchronize my fork w.r.t. the main original branch, right?

I usually squash the PR and merge it to master (the main branch). After I have done this (and I just did this for PR #99), everybody must run

git checkout master
git pull

to fetch the merged PR into one's own code tree.

PD: Sorry, I could not answer before because I was on vacation (from June 15 to yesterday).

Don't worry, I was on vacation last week too!