Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup merge conflict resolution from #47, #48, #49, and #50 #53

Merged
merged 4 commits into from
Apr 1, 2015
Merged

Cleanup merge conflict resolution from #47, #48, #49, and #50 #53

merged 4 commits into from
Apr 1, 2015

Conversation

wking
Copy link
Contributor

@wking wking commented Mar 28, 2015

Several of these PRs made semantically independent changes to the same
set of lines, which lead to a number of merge conflicts. While most
of the merge conflicts were resolved appropriately, some of the
resolutions accidentally reverted one of the semantic changes. This
PR goes through and corrects those mistakes, so we get all the changes
intended by the various PRs. Details about an individual fix, the
change being restored, and the merge that I'm fixing are in the
individual commit messages.

wking added 4 commits March 28, 2015 11:19
@wking
03-filter.md: Fix single/double quote resolution
a8dd290 
This restores the double-to-single quote change from 3cc3a7d (Use
single quotes for string literals, 2015-03-25) which was lost in
16e8e67 (fixing merge conflict, 2015-03-26).
@wking
03-filter.md: Remove conflict-markers around the date type callout
a9df6c1 
These were added in c0756e2 (fixing merge conflict, 2015-03-26).  I've
resolved them by removing the parentheses comment (following 06563c2,
03-filter.md: Drop redundant parentheses, 2015-02-25) and adding the
date type callout header (following 23ca7c1, 03-filter.md: Use a
callout box for the blurb about date types, 2015-03-25).
@wking
03-filter.md: Fix partial date
c24de3c 
This restores the partial-to-real date change from 554089b (Drop
partial dates (YYYY-00-00), 2015-03-25) which was lost in c0756e2
(fixing merge conflict, 2015-03-26).
@wking
05-null.md: Fix single/double quote resolution
0c881e9 
This restores the double-to-single quote change from 3cc3a7d (Use
single quotes for string literals, 2015-03-25) which was lost in
0ef5114 (fixing merge conflict, 2015-03-26).
@wking
Copy link
Contributor Author

wking commented Mar 28, 2015

Since cross-references from the PR summary don't seem to be active links, I'm copying the effected PRs here to get links (and backlinks from those PRs). #47, #48, #49, and #50

@wking wking changed the title Cleanup merge conflict resolution from #44, #47, #48, #49, and #50 Cleanup merge conflict resolution from #47, #48, #49, and #50 Mar 28, 2015
mckays630 added a commit that referenced this pull request Apr 1, 2015
@mckays630
Merge pull request #53 from wking/fix-merge-conflict-resolution
a8aa095 
Cleanup merge conflict resolution from #47, #48, #49, and #50
@mckays630 mckays630 merged commit a8aa095 into swcarpentry:gh-pages Apr 1, 2015
@wking wking mentioned this pull request Apr 5, 2015
Merged
@wking wking deleted the fix-merge-conflict-resolution branch April 5, 2015 17:08
@wking wking mentioned this pull request Apr 20, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wking @mckays630