Re: [Exist-development] develop branch

[Adam R. <ad...@ex...>]

I think the problem is more than just that. I have rebased our repo on
GitHub in the past twice and yes people have to rebase their local
copies if you do that, but...

there are more problems here that I can see, Lars commit seems to
contain changed to 98 files which it should not touch, the next PR
from Tobi then purports to change almost every file, I *guess* because
of a problem introduced by Lars commits.

I can fix this for sure as I still have a good local copy before these
changes, but it would be really good if I could get some agreement for
me fixing this...

On 27 June 2015 at 17:36, Wolfgang Meier <wol...@ex...> wrote:
> Well, my Internet connection doesn't work this weekend, so I couldn't see
> the changes Lars did yesterday evening to clean up the repo in preparation
> of the next release.
>
> But as I understood it, we all need to rebase our local copies. This is
> described on our github page and usually the procedure is painless if you
> follow it exactly.
>
> Wolfgang
>
> Am 27.06.2015 17:36 schrieb "Jens Østergaard Petersen" <oe...@gm...>:
>>
>> Is this a git/GitHub problem? Does anyone have any ideas?
>>
>> Jens
>>
>> On 27 Jun 2015 at 10:22:07, Dmitriy Shabanov (sha...@gm...) wrote:
>>
>> Hi,
>>
>> Something bad happen with develop branch?
>>
>> --
>> Dmitriy Shabanov
>>
>> ------------------------------------------------------------------------------
>> Monitor 25 network devices or servers for free with OpManager!
>> OpManager is web-based network management software that monitors
>> network devices and physical & virtual servers, alerts via email & sms
>> for fault. Monitor 25 devices for free with no restriction. Download now
>>
>> http://ad.doubleclick.net/ddm/clk/292181274;119417398;o_______________________________________________
>> Exist-development mailing list
>> Exi...@li...
>> https://lists.sourceforge.net/lists/listinfo/exist-development
>>
>>
>>
>> ------------------------------------------------------------------------------
>> Monitor 25 network devices or servers for free with OpManager!
>> OpManager is web-based network management software that monitors
>> network devices and physical & virtual servers, alerts via email & sms
>> for fault. Monitor 25 devices for free with no restriction. Download now
>> http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
>> _______________________________________________
>> Exist-development mailing list
>> Exi...@li...
>> https://lists.sourceforge.net/lists/listinfo/exist-development
>>
>
> ------------------------------------------------------------------------------
> Monitor 25 network devices or servers for free with OpManager!
> OpManager is web-based network management software that monitors
> network devices and physical & virtual servers, alerts via email & sms
> for fault. Monitor 25 devices for free with no restriction. Download now
> http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
> _______________________________________________
> Exist-development mailing list
> Exi...@li...
> https://lists.sourceforge.net/lists/listinfo/exist-development
>



-- 
Adam Retter

eXist Developer
{ United Kingdom }
ad...@ex...
irc://irc.freenode.net/existdb