[OpenLayers-Dev] Unnecessary merge commit

Tim Schaub tschaub at opengeo.org
Thu Sep 13 13:19:52 PDT 2012


On Wed, Aug 22, 2012 at 2:12 PM, Marc Jansen <jansen at terrestris.de> wrote:
> Hi Xavier,
>
> you are perfectly right.
>
> because I fuddled too much with my clone, all the commits of the pull
> request #414 (https://github.com/openlayers/openlayers/pull/414) are
> included in the commit df19317c95d2ff3473e957634f523ba38ac4d8b8.
>
> How shall I proceed? 414 IMHO never got fully reviewed, so the commits it
> includes might be reverted. If someone is willing to have a look at the
> introduced changes, I think this can stay in master. What do you think?

Agreed they should stay in (as they have).

Tim

> Best regards,
> Marc
>
>
>
> On 18.08.2012 18:06, Xavier Mamano (jorix) wrote:
>>
>> Hi,
>>
>> This may be related to the merge of the
>> https://github.com/openlayers/openlayers/pull/414 ? (nine seconds ago)
>>
>>
>>
>>
>> Marc Jansen-2 wrote
>>>
>>> Hi all,
>>>
>>> you may have noticed my (superfluous) commit
>>> df19317c95d2ff3473e957634f523ba38ac4d8b8 which I pushed to
>>> openlayers/master. Should we revert/<whatever> this commit since it only
>>> makes the history of the codebase more complicated than needed?
>>>
>>> Sorry for any inconvenience caused; and I mean it.
>>>
>>> Regards,
>>> Marc
>>>
>>>
>>> _______________________________________________
>>> Dev mailing list
>>> Dev at .osgeo
>>> http://lists.osgeo.org/mailman/listinfo/openlayers-dev
>>>
>>
>>
>> --
>> View this message in context:
>> http://osgeo-org.1560.n6.nabble.com/Unnecessary-merge-commit-tp4996034p4996106.html
>> Sent from the OpenLayers Dev mailing list archive at Nabble.com.
>> _______________________________________________
>> Dev mailing list
>> Dev at lists.osgeo.org
>> http://lists.osgeo.org/mailman/listinfo/openlayers-dev
>
>
> _______________________________________________
> Dev mailing list
> Dev at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/openlayers-dev



-- 
Tim Schaub
OpenGeo http://opengeo.org/
Expert service straight from the developers.


More information about the Dev mailing list