trac requests are migrated to github bugtracker #880
Merged
Conversation
This file contains 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
|
"This pull request contains merge conflicts. Please resolve them." I am unsure why github complains, I edited this file immediately after forking. |
|
What was the merge conflict? |
|
It conflicted since the commit had d40f6b9 as its parent, and since then, 4f4bfff changed the readme. Since https://github.com/mkoniecz/openstreetmap-carto is currently on d40f6b9 too, I guess you were looking at your own (outdated) repo when you hit edit, and then when you created the PR against my repo, the conflict arose. Just in case you're still wondering :-) |
|
Answered within a second :). Are you a bot? :P |
|
I type fast :-) |
|
And it was result of fact that Github on using fork button is not warning that repository was already forked - it silently redirects to the old one. |
matthijsmelissen
added a commit
to matthijsmelissen/openstreetmap-carto
that referenced
this pull request
Mar 22, 2015
Add labels for: * amenity=post_office (resolves gravitystorm#840) * natural=tree (resolves gravitystorm#801) * amenity=car_sharing (operator, resolves gravitystorm#880) * amenity=atm (operator) * amenity=bicycle_rental * man_made=mast * amenity=recycling * amenity=drinking_water * man_made=water_tower * tourism=picnic_site * leisure=picnic_table * leisure=slipway Resolves gravitystorm#1091.
matthijsmelissen
added a commit
to matthijsmelissen/openstreetmap-carto
that referenced
this pull request
Mar 26, 2015
Add labels for: * amenity=post_office (resolves gravitystorm#840) * natural=tree (resolves gravitystorm#801) * amenity=car_sharing (operator, resolves gravitystorm#880) * amenity=atm (operator) * amenity=bicycle_rental * man_made=mast * amenity=recycling * amenity=drinking_water * man_made=water_tower * tourism=picnic_site * leisure=picnic_table * leisure=slipway Resolves gravitystorm#1091.
matthijsmelissen
added a commit
to matthijsmelissen/openstreetmap-carto
that referenced
this pull request
Apr 27, 2015
Add labels for: * amenity=post_office (resolves gravitystorm#840) * natural=tree (resolves gravitystorm#801) * amenity=car_sharing (operator, resolves gravitystorm#880) * amenity=atm (operator) * amenity=bicycle_rental * man_made=mast * amenity=recycling * amenity=drinking_water * man_made=water_tower * tourism=picnic_site * leisure=picnic_table * leisure=slipway Resolves gravitystorm#1091.
matthijsmelissen
added a commit
to matthijsmelissen/openstreetmap-carto
that referenced
this pull request
Apr 29, 2015
Add labels for: * amenity=post_office (resolves gravitystorm#840) * natural=tree (resolves gravitystorm#801) * amenity=car_sharing (operator, resolves gravitystorm#880) * amenity=atm (operator) * amenity=bicycle_rental * man_made=mast * amenity=recycling * amenity=drinking_water * man_made=water_tower * tourism=picnic_site * leisure=picnic_table * leisure=slipway Resolves gravitystorm#1091.
matthijsmelissen
added a commit
that referenced
this pull request
May 4, 2015
Add labels for: * amenity=post_office (resolves #840) * natural=tree (resolves #801) * amenity=car_sharing (operator, resolves #880) * amenity=atm (operator) * amenity=bicycle_rental * man_made=mast * amenity=recycling * amenity=drinking_water * man_made=water_tower * tourism=picnic_site * leisure=picnic_table * leisure=slipway Resolves #1091. Increase text size for amenity=bank labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.