(This is the first part of a two-part announcement. Please reply to this thread if you have any problems with the merge.)
We’re about to push our first set of updates to the base OS/161 sources. You will need these before you can submit ASST1. These changes bring our base OS/161 sources up to OS/161 version 2.0.3, which David release recently.
Unfortunately, there is a fairly good probability that these changes will cause merge conflicts if you have started ASST1. They introduce a new deadlock detector into the kernel which requires changes to your locks. So please be careful as you perform this merge. The change is fairly minor, and feel free to ask for help. Note that the deadlock detection code should be added inside of the critical section inside of
Assuming you have our OS/161 GitHub repository set up as your
staff remote, here is what to do. First, make sure that all of your changes are committed and pushed before proceeding. Then:
git pull staff master git status
git pull completes, either one of two things will have happened. Both
git pull and the following
- The merge will have been completed successfully without causing any conflicts.
- The merge will have created conflicts for you to address.
Even if the merge does not create conflicts I would strongly suggest that you review the files that were changed. Git’s merging algorithms are good, but not perfect. You should probably examine any changes to files that you may have edited. Changes to files that you don’t know or care about can usually be safely ignored.
Merge conflicts happen when Git detects overlapping changes to the same files. When this happens, you’ll find this kind of content in the files that are conflicted:
<<<<<<<<<<<<<<<<<<<<<< One set of changes ====================== The other set of of changes. >>>>>>>>>>>>>>>>>>>>>>
Your job is to combine both sets of changes and remove the conflict markers. Once that’s done, you can use
git add <filename> to tell Git that you are done with the file. Once you have successfully addressed all conflicts, use
git commit to finish the merge commit and you are done.
Also note that you need to successfully merge these changes and update
test161 to version 1.3.0 (see the next part of this post) before you can submit your solutions. Happily, updating
test161 is simple.
If you have trouble, please reply to this thread. I’ll be online periodically this weekend to help, and will ask other staff members to monitor the forum as well.