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

Please sync your fork before you send PR to <your-student-id> branch #338

Closed
lauren-yrluo opened this issue Oct 7, 2021 · 1 comment
Closed
Labels
PA1 Programming Assignment 1 PA2 Programming Assignment 2

Comments

@lauren-yrluo
Copy link

lauren-yrluo commented Oct 7, 2021

You have to make sure your PR does not have conflicts with <your-student-id> branch. Otherwise it will not be merged.

Before sending a PR, you may need to sync your fork to avoid conflicts. That is, suppose you are on the branch that you develop your PAs. You have to run the followings.

$ git remote add upstream git@github.com:NTU-ALComLab/LSV-PA.git
$ git fetch upstream
$ git merge upstream/<your-student-id> 
$ git push

Note that for PA1 & PA2, you have to send PR to <your-student-id> branch.
DO NOT send PR to master.
Thanks.

@lauren-yrluo lauren-yrluo added PA1 Programming Assignment 1 PA2 Programming Assignment 2 labels Oct 7, 2021
@nianzelee
Copy link
Member

DO NOT send PR to master.

Don't worry. All PRs sent to master will be automatically closed by the lockdown CI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PA1 Programming Assignment 1 PA2 Programming Assignment 2
Projects
None yet
Development

No branches or pull requests

3 participants