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

[LAB2] 312555022 #116

Closed
wants to merge 0 commits into from
Closed

[LAB2] 312555022 #116

wants to merge 0 commits into from

Conversation

ian60509
Copy link

  • A clear title (name your PR "[LAB{lab_number}] {your_student_id}")
  • A meaningful message for PR, as well as its commits
  • From your specific branch (not main or other's branch) merging to your branch
  • Excluding any irrelevant files, such as binaries, text files, or dot files
  • Passing all CI (You should check it first to pass one of the validations in CI. However, you need to make sure your PR passes all CI after you submit it.)

@TaiYou-TW TaiYou-TW added the lab2 label Mar 10, 2024
@AlaRduTP
Copy link
Contributor

@ian60509 Please remove all the CRLFs (they should be LFs) in the changed files, and then resolve any conflicts.

FYI: Configuring Git to handle line endings

@ian60509
Copy link
Author

ian60509 commented Mar 24, 2024

目前已經解決CRLF => LF

助教您好,想請問一個問題: 在lab2中我只有修改main_test.js,但是為了要reslove merge conflict,因此讓PR出現不該改動的檔案(lab3, lab4),導致CI failed。我想是因為目前312555022已經和我在forked repo中的進度不同導致。
因此想請問是否同意我在forked repo 中按sync fork然後重新新增一個commit下上lab2中的main_test.js 然後重新提交一次PR
感謝!

@TaiYou-TW
Copy link
Contributor

目前已經解決CRLF => LF

助教您好,想請問一個問題: 在lab2中我只有修改main_test.js,但是為了要reslove merge conflict,因此讓PR出現不該改動的檔案(lab3, lab4),導致CI failed。我想是因為目前312555022已經和我在forked repo中的進度不同導致。 因此想請問是否同意我在forked repo 中按sync fork然後重新新增一個commit下上lab2中的main_test.js 然後重新提交一次PR 感謝!

No problem.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants