Re: [Tiki-devel] Semi-automatic merging from 12.x to trunk

[lindon <li...@ti...>]

Hi Jonny,

+ 1 Jonny and thanks for doing a disproportionate share of the heavy
lifting when it comes to merging.

I think more than "volunteers", we really need those who are committing
during the semi-automatic merging phase, especially the longer we're into
it, to help with merging as they are committing, especially if the commit
has a some likelihood of causing a conflict. This may mean merging before
the commit and/or merging after. And if you're not sure, go ahead and merge
after you commit. This way people are fixing their own conflicts as much as
possible.

Having said that, I am also guilty of shirking my duties here because of
inexperience and I get quite freaked out when there is a conflict since it
makes me realize how little I know about what I'm doing (and that's when I
tend to stop merging!). For instance, I'm not sure whether "accept mine" is
trunk or 12x so I wind up going in and editing the file in shell (which I
also learned in the heat of battle how to save and move on with the merge).
So I think adding more documentation on dealing with conflicts to
http://dev.tiki.org/Semi-automatic+merging+period would be helpful (and
help protect tiki!). I've been meaning to do that but documentation is the
last thing on my mind when I'm sweating through one of those situations and
then I forget exactly why I did afterwards. Will take a deep breath next
time...

You mention using phpStorm - I've been doing this all through shell so
would be good to understand how you incorporate phpStorm into the shell
steps. Also, you mentioned once noting the version numbers to make sure a
commit isn't lost - I'm sure this is a simple thing still not quite sure
how to do that exactly - any tips appreciated.
Regards,
lindon






On Fri, Nov 29, 2013 at 6:53 AM, Jonny Bradley <jo...@ti...> wrote:

>
> Hi all
>
> Merges are getting increasingly time consuming - 5 conflicts in this
> morning's first merge so i am suggesting that, unless lots of other
> developers who are working on 12.x also help do these merges, that we stop
> the merging period when 12.0 is released, which i believe could be later
> today.
>
> Merges need doing several times a day and i cannot guarantee to do that
> (in fact i can guarantee that i can't and won't).
>
> I know LP and Lindon have in the past been helping with this, for which
> many thanks but the last merge by anyone other than me was well over a week
> ago (thanks Lindon, and i know LP was away, but we need more then three of
> us doing this).
>
> With so much going on in trunk now these merges need doing every few hours
> imho.
>
> N.B. When we stop merging, all changes and fixes for 12.x will need making
> in trunk first and then backporting, so in many areas, especially in any
> work on the templates, this will probably be virtually impossible.
>
> Thanks, hoping to hear from lots of volunteers! :)
>
> jonny
>
>
>
> ------------------------------------------------------------------------------
> Rapidly troubleshoot problems before they affect your business. Most IT
> organizations don't have a clear picture of how application performance
> affects their revenue. With AppDynamics, you get 100% visibility into your
> Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics
> Pro!
> http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
> _______________________________________________
> TikiWiki-devel mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>