Clean up the mis-merges introduced by #117. #164
Merged
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
MaineC
approved these changes
Oct 21, 2019
Member
MaineC
left a comment
MaineC
left a comment
There was a problem hiding this comment.
I left two minor comments, feel free to address or ignore. Good to go otherwise.
Comment on lines
-76
to
-78
| [EDITOR NOTE: There was actually a paper on how trust is build up on remote/asynchronous collaboration. Maybe I'll find that again. | ||
| The basic point is that aside of reliability in collaboration, continued presence the effect of water cooler discussions and food/drink consumption is quite impressive... | ||
| ] |
Member
There was a problem hiding this comment.
Was that by intention that you deleted both paragraphs?
Member
Author
There was a problem hiding this comment.
This is the same note as the one for 44-46, thus removing both. Comment is addressed above.
Comment on lines
-44
to
-46
| [EDITOR NOTE: There was actually a paper on how trust is build up on remote/asynchronous collaboration. Maybe I'll find that again. | ||
| The basic point is that aside of reliability in collaboration, continued presence the effect of water cooler discussions and food/drink consumption is quite impressive... | ||
| ] |
Member
There was a problem hiding this comment.
I assume you didn't find the publication?
Member
Author
There was a problem hiding this comment.
The trust in PR's paper is the one that is linked at the bottom of the corresponding article.
A food & water cooler one didn't pop up in my paper stash anymore. The first one is worth a look, though.
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.
The merge in #117 introduced some duplications and breakage.
This PR should remove most, if not all of it. Please review it and see if I've overseen anything.