This repository has been archived by the owner on Jun 7, 2023. It is now read-only.
Merge conflict practice #84
Open
Conversation
This file contains 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
Each of the 190-Round2 issues in the issue tracker add links to the README.md file. This commit, when merged into main will introduce changes that conflict with all of the changes requested by those issues. It should be merged after students synch with main and as or just after they submit their PR's for the 190-Round2 issues.
…al documentation.
…oint in the Prerequisites section.
…he Documentation section of the CONTRIBUTING.md fileâile
Fixed typo: type ext to text
Pluralize Update for clarity in the first sentence of the Documentation section of the CONTRIBUTING.md file
fixing the syntax for manager, worker, and guess to be similar to admin
Typo 'ad' fixed
Pluralize it (to 'its')for clarity
…tLink Added a how-to pull request link in CONTRIBUTING.MD
Under the Workflow header, changed the word "Fork" to a Link. CONTRIBUTING.md
…eInContributing Added and replaced commas at the locations specified in issue dickinson-comp190#19 in CONTRIBUTING.md
Added "that" between tutorial and walks
…rding Changed 'you' to 'your' in Onboarding
Add missing 'with' between 'experiment' and 'FarmData2'
…censing-Section Change-It-To-Its-In-Licensing-Section
…yStep Added hyphen to step by step in the CONTRIBUTING.md file
…adMe Added a between in and module in README
…tenceInONBOARDING Complete the last sentence of FarmData2 School section
…rtsSingular Changed "starts" to "start" in INSTALL.md to improve clarity.
remove duplicate are in CONTRIBUTING.md
Changed Issue dickinson-comp190#21 from 'is' to 'it'
Typo fixed "Command" in INSTALL.me
…ding fixed following typo in onboarding.md
…und-two-conflicts Changes that conflict with Round2 Issues.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Pull Request Description
Replace farmOS API URL close #81
Licensing Certification
FarmData2 is a Free Cultural Work and all accepted contributions are licensed as described in the LICENSE.md file. This requires that the contributor holds the rights to do so. By submitting this pull request I certify that I satisfy the terms of the Developer Certificate of Origin for its contents.