Testmerge #1785
Open
Testmerge #1785
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
deleted old folders Added section structure Removal removed last of old folders fork, wait, and exec syscalls Old syscall folder structure and perror Section covers parsing How to write a Makefile Resources for HW0 stat syscall and using file descriptors Covers directory syscalls and bitwise operations Covers functions for -l flag and color output Resources for HW1 Covers dup and pipe Resources for HW3 Resources for HW4 Additional material Resources for HW4 Resources for HW3 Resources for HW2 Resources for HW3 Resources for HW4 Squashed all into one commit Added missing files perror, exec, and other syscalls Additional resources assignment to create a basic Unix shell Practice with using Vim practice using git and github Useful parsing tools Making Makefiles for your project files and folders restructured Implement ls on your own Practice controlling fork and making fork bombs Practice debugging with gdb updated README working with file descriptors stat structs and syscall opendir, readdir, and more getcwd, getpwuid, and getgrgid format your programs output Added resources updated chapter cleaned up textbook readme piping and io redirection implement cp implement rm Added resource files all about io redirection Added Resources signals and cd using sigaction implement cstring functions Added resources contributing to open source projects learn to send spam removed old chapter files Textbook structure Added videos folder Updated README deleted extra folder added cheatsheets to appendix removed old cheatsheets folder renamed appendix Corrected spelling and grammatical errors added README Updated resource files removed old folders changed folder name updated READMEs renamed directory updated README slight edits to README updated README updated README Updated READMEs with emboldened file names Updated ch0 README with correct title and minor fix quick update on README for ch2 updated README updated README again updated READMEs for chapters 3 and 4 More updated READMEs (textbook, appendix, ch4) updated README Added couple of faqs changed FAQ.md files to faq.md testing relative links Updated FAQs and READMEs Moved videos and cheatsheets up a directory testing links for README Added links linked README Linked chapter READMEs corrected links to hw0 Corrected links for hw1 corrected links in hw and lab4 minor fix fixed main README Please enter the commit message for your changes. Lines starting updated READMEs, moved valgrind tutorial more updates to READMES added styleguide lecture notes fixed typo fixed spelling error, grammar, and formatting for README.md in textbook/assignment-help/sort. fixed backticks and capitalization Update README.md Update README.md One final attempt at grammar fix Sorry for all the pull requests hw4 submission finalizing hw4 formatting reformatting still reformatting fixed font sizes removed testing file reformatted README.md with sentences on individual lines for readability finalizing hw4 fixing README.md HW4 final version: squashed hw4 first draft: dynamic and static link HW4 2nd draft added contents Added examples modified indent change syntax to bold modified order hw4 v1.0 fixed grammar Fixed typos delete * modified format final change Added to README hw4 third Tor Relay Setup Guide updated io.md exec.md and added examples updated fixed updated io.md fixed Linus Torvalds spelling fixed spelling errors in files Moved files moved files to right folder last updates
Owner
|
Thanks! We had discussed that you'd be getting 110/100 on this project. I'm going to deduct 10 points for the more complicated merging procedure, giving you 100/100. I've entered the grade now, but I won't be going through the merging process for a few days probably. |
Contributor
Author
|
Yeah, sorry about that, I tried to minimize the conflicts as much as possible. Also, I completely forgot to add this, but I think I was supposed to remind you about the extra-credit for the writing center here. Wasn't too clear on that. |
Owner
|
Thanks for the reminder. I've added +5 pts of extra credit. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Very last edits, just cleaned up stuff and added corrected links in the main repository README.
Sorry I couldn't squish it down to just one commit, I didn't want to risk it since the "first" has two parents and I'm honestly not sure how to do that. And sorry there is so many commits, I get finicky sometimes!
There are still a few merge conflicts, but it's mostly just from some folder changes. I tested it on my own stuff and assuming I'm doing it correctly (albeit slowly), most of it takes like 5 minutes.