This repository was archived by the owner on Aug 13, 2019. It is now read-only.
[WIP Don't merge this yet] Create pre-existing conflicts#3
Open
githubteacher wants to merge 1 commit intomasterfrom
Open
[WIP Don't merge this yet] Create pre-existing conflicts#3githubteacher wants to merge 1 commit intomasterfrom
githubteacher wants to merge 1 commit intomasterfrom
Conversation
|
undertood |
DannasCornell
approved these changes
Apr 17, 2019
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
This PR aims to create conflicts within the repo so that the bot doesn't have to generate them.
Still waiting on a few commits for the simple conflict exercise.
cc: @hectorsector