search

kurokida / jsQUEST

A Bayesian adaptive psychometric method for measuring thresholds in online experiments.
MIT License
17 stars 4 forks source link

Modularize es6 #2

Closed tpronk closed 3 years ago

tpronk commented 3 years ago

Hey Daiichiro,

This is the modularized version of jsQUEST. This PR closes #1.

Best, Thomas

NB. Note the "closes #1". This makes merging this pull request automatically resolve the issue.

kurokida commented 3 years ago

Thank you very much for sending a pull request.

I have a few questions. I am new to merge, so I guess I don't understand the rudiments of it. I would be very happy if you could tell me.

Question 1: If I merge your request, The README.md is probably overwritten by yours. Your READEME file is of course useful, but I would also like to keep what is written in my READEME. What should I do in such a situation? Once I have merged your request, should I edit the file?

Question 2: My jsQuestDemo.html seems to link to your dist/demo.html. How did you create this link? I'm interested in how you do that.

Question 3: If I merge your request, will I lost docs/index.md and the files included in the jsPsychDemo folder?

tpronk commented 3 years ago

Hey again!

  1. Hmmm, not sure actually. This page describes how to add your own commits to my PR. Perhaps an easier route is to merge my PR and then make modifications to the README.md?
  2. I'm not sure what you mean, can you give me another pointer?
  3. It will still be in the history of your repo (via git you can go back to any prior state). See the history of jsQUEST here. Another way is making a new branch.
kurokida commented 3 years ago

Thank you for your reply.

I've read the page you provided and understand most of it, but first I'm going to merge your pull request and edit it.

I'm sorry for the lack of explanation on question 2. On GitHub, it is displayed as shown in the attached figure. (jsQuestDemo.html -> dist/demo.html) スクリーンショット 2021-06-08 104428

I'm interested in whether the relationship between these two files was created automatically or manually. In other words, it is not treated as that the jsQuestDemo.html was removed, and the demo.html was added. Did GitHub automatically recognize that the jsQuestDemo.html has been renamed to demo.html?

tpronk commented 3 years ago

Aha, thnx for clarifying. I didn't do anything special on my side; I just had a commit where I deleted jsQuestDemo and added demo. I'm not sure how GitHub knows that these two files are related, I guess some smart parsing of the similarities between them in combination with one being deleted and one being added in the same commit? Cool features though

kurokida commented 3 years ago

Thank you for your reply. I will try to merge your request now.