Merge conflict practice - #60
Open
aarontapper wants to merge 25 commits into
Open
Conversation
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.
Issue 4: changed ext to text
Fix typo in covenant
Capitalized and added missing s to 'cypress' & pluralized 'work'
Fixed typo: running (previously runing)
Deleted unnecessary word, 'based' from end of file
Commit staged files to active branch -- Fix Missing t
pluralize it (i.e. its) for clarity
…That Change from 'which' to 'that' in the first paragraph of the LICENSE.md file
Replace initializtion with initialization
Replaces uppercase instances of FarmOS with farmOS, fixing bug DickinsonCollege#6
…d-two-conflicts Changes that conflict with Round2 Issues.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 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.
Pull Request Description
Merge conflict practice
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.