Hello,
I do not understand the instructions given here (nor could make them work by trial and error):
https://moodlearchive.epfl.ch/2021-2022/mod/forum/discuss.php?d=64620#p129888
- add the homework 1 repository as a git remote in your homework 0 repository
- create a dev branch in your homework 1 repository
- pull your homework 0 code in that dev branch (git pull should work because you've added the homework 1 repository as a remote)
- pull the homework 1 master branch, containing the skeleton, into your dev branch; there should be no conflicts.
It's mostly the 2nd bullet point which causes me pause.If the dev branch is created from the hw1 master, then why does the 4th bullet point exists?
If the dev branch is created from the hw0 final version, then why does the 3rd bullet point exists?
If the dev branch is created as an orphan branch, well, then that's seems like a hacky and quite unconventional way of doing. And I couldn't make it work either anyways .
And all of my 3 interpretations all produce merge issues.
Sure, I'd probably have wasted way less time if I just copy-pasted my code into hw1, but assuming you're going to use the same workflow for all future homeworks, I'd like to understand the proper way of doing it.
Could you please enlighten me?
