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 n
Hi,
On 11 Feb 2014, at 19:16, Yuriy Tymchuk 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 v
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 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 wrote:
>
>> Can
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 wrote:
> Can we get something from git branches with file tree?
>
> Uko
>
> On 11 Feb 2014, at 17:26, Esteban Lorenzano wrote:
>
>> in monticello, each pac
Can we get something from git branches with file tree?
Uko
On 11 Feb 2014, at 17:26, Esteban Lorenzano 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 reposit
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 wi
sergio_101 wrote
> is this possible with monticello, or am i just missing an ideology?
There's not really first class branching in MC. The convention, which is
somewhat supported by the tools, is to include an extra segment like this.
If you want an issue101 branch, you save the package as
MyPack
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.
havi
