Hi, On 11 Feb 2014, at 19:16, Yuriy Tymchuk <yuriy.tymc...@me.com> wrote:
> I’m worried a bit about merging. Won’t it damage some monticello meta data? If you start with 2 version with correct meta data and ancestries, no. This could be helpful: http://www.lukas-renggli.ch/blog/monticello-merging It all sounds very magic, but it is quite simple. Apart from the fact that merging often means fixing conflicts. That is true everywhere. Sven > Uko > > On 11 Feb 2014, at 18:22, Esteban Lorenzano <esteba...@gmail.com> wrote: > >> you can… filetree is a file format. What you do with those files is up to >> you and your tools :) >> >> On 11 Feb 2014, at 17:30, Yuriy Tymchuk <yuriy.tymc...@me.com> wrote: >> >>> Can we get something from git branches with file tree? >>> >>> Uko >>> >>> On 11 Feb 2014, at 17:26, Esteban Lorenzano <esteba...@gmail.com> wrote: >>> >>>> in monticello, each package is itself a branch. >>>> >>>> so you can have different approachs: >>>> >>>> - you just rename your package to YourPackage-YourBranch >>>> - you use different repositories >>>> - yo do not do anything and you just realise that each package is a >>>> branch, so you can start from anywhere and merge with anything :) >>>> >>>> Esteban >>>> >>>> On 11 Feb 2014, at 16:46, sergio_101 <sergio....@gmail.com> wrote: >>>> >>>>> i am sort of foggy on how to effectively use branching with monticello. >>>>> currently, we use branches daily. we branch off the master, and give it >>>>> some name "like update_user_functions".. >>>>> >>>>> we develop away on that, and when it's time, we merge that back into >>>>> master, and push out to the server. >>>>> >>>>> having named branches makes it very easy for us track what's going on in >>>>> the development line. >>>>> >>>>> is this possible with monticello, or am i just missing an ideology? >>>>> >>>>> thanks! >>>>> >>>>> -- >>>>> ---- >>>>> peace, >>>>> sergio >>>>> photographer, journalist, visionary >>>>> #BitMessage BM-2D8VWUJSS41RFKh1ec83preVabHrnniExa >>>>> >>>>> http://www.ThoseOptimizeGuys.com >>>>> http://www.CodingForHire.com >>>>> http://www.coffee-black.com >>>>> http://www.painlessfrugality.com >>>>> http://www.twitter.com/sergio_101 >>>>> http://www.facebook.com/sergio101 >>>> >>> >> >
