-
Notifications
You must be signed in to change notification settings - Fork 1
FAQ
Once you accept the invitation to one of the workshop, a dedicated repository for your code is automatically created at this link. You can type your usename in the textbox to filter the results.
At this point, click on the name of the repository you are currently working on and access the dedicated repository page. From there, locate the Pull Requests
button at the top and click on it.
You should see now there is an open pull request called Feedback
. Click on it to inspect it.
Now, in the middle of the page, you should be able to see a list of operation that have been performed on your repository. Some of them took place behind the scene by the automatic workflow we put in place for testing and grading your solution, while others have associated the commit message you defined while pushing your solution. Like in this example, you can see I committed some changes with the text Solution
If you happen to have a green tick next to changes YOU made, it means your solution successfully passed the test and you can consider you workshop to have been passed. If, by any chance, you see a red cross, it means something happened and your solution is not complete and/or fully correct.
Please follow the following instructions suggested by the git output
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
As such, please copy the following three lines into your terminal and execute them. Do another synch and push after that.
git config pull.rebase false
git config pull.rebase true
git config pull.ff only
git pull
git rebase
git push