2/4: importing changes in master to edits-jhfung#3
Merged
10 commits merged intoedits-jhfungfrom Feb 4, 2016
Merged
Conversation
to thank everyone for coming, regardless of written contribution
checks for Aut vs Aut_1, added some parentheses.
nnngh, sorry, doing an --amend messed up the MERGE_HEAD. i think this avoids destroying history, though it looks ugly :(
|
i messed up the merge a little bit (by merging, commiting, then compiling (like an idiot), noticing an error, un-committing, fixing the error, re-commiting, and not noticing that this damaged the MERGE_HEAD tag). so, i ended up doing it twice, which looks silly but no history was lost and it's safe to sync with. that'll have to do. |
ghost
pushed a commit
that referenced
this pull request
Feb 4, 2016
2/4: importing changes in master to edits-jhfung
ghost
merged commit
Collaborator
Author
|
Thanks! See you tomorrow. |
This pull request was closed.
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
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.
I'd like to update my working branch with the edits people have made to the master branch.