Posted by
Goubier Thierry on
Feb 12, 2014; 8:26am
URL: https://forum.world.st/branching-with-monticello-tp4742815p4742936.html
No, but:
- merging with git creates conflicts in FileTree metadata (version,
methodProperties in each class) and those conflicts are messy to fix
(the version particularly) and loses merge information (the Monticello
history will not record the merge)[1] [2].
- merging with Monticello does not record as a merge in git.
[1] gitfiletree could solve that as it doesn't need the version and
methodProperties metadata, but it still writes them to disk to be
compatible with FileTree.
[2] gitfiletree will show you the merge in Monticello however (but
FileTree won't).
Thierry
Le 11/02/2014 19:16, Yuriy Tymchuk a écrit :
> I’m worried a bit about merging. Won’t it damage some monticello meta data?
>
> Uko
>
> On 11 Feb 2014, at 18:22, Esteban Lorenzano <
[hidden email]
> <mailto:
[hidden email]>> 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 <
[hidden email]
>> <mailto:
[hidden email]>> wrote:
>>
>>> Can we get something from git branches with file tree?
>>>
>>> Uko
>>>
>>> On 11 Feb 2014, at 17:26, Esteban Lorenzano <
[hidden email]
>>> <mailto:
[hidden email]>> 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 <
[hidden email]
>>>> <mailto:
[hidden email]>> 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.thoseoptimizeguys.com/>
>>>>>
http://www.CodingForHire.com <
http://www.codingforhire.com/>
>>>>>
http://www.coffee-black.com <
http://www.coffee-black.com/>
>>>>>
http://www.painlessfrugality.com <
http://www.painlessfrugality.com/>
>>>>>
http://www.twitter.com/sergio_101>>>>>
http://www.facebook.com/sergio101>>>>
>>>
>>
>
--
Thierry Goubier
CEA list
Laboratoire des Fondations des Systèmes Temps Réel Embarqués
91191 Gif sur Yvette Cedex
France
Phone/Fax: +33 (0) 1 69 08 32 92 / 83 95