Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

Hi Damien, Le 20/01/2016 20:09, Damien Pollet a écrit : Hm. I saved code in a clone of Mariano's project, and a bunch of metadata files were created. Did I miss a step on configuring the repo so it's metadataless ? If you save with a version of GitFileTree which hasn't the metadata-less

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

Hm. I saved code in a clone of Mariano's project, and a bunch of metadata files were created. Did I miss a step on configuring the repo so it's metadataless ? On 16 January 2016 at 15:18, Mariano Martinez Peck wrote: > OK, thanks Thierry. > > BTW, thanks for all the help

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

Damien, I think the "metadata-less" name is a bit wrong. I think you did it correct. The metadataless is that only SOME of the metadata is ignored, such as "version" and I don't remember what else. I am comparing the HEAD of your clone with mine and we seem to have the same .filetree and .json so

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

I rebuilt the image, then reloaded OSSubprocess from my own clone, on top of the one loaded by GitFileTree no metadata reappeared (so far…) On 20 January 2016 at 20:45, Mariano Martinez Peck wrote: > No, something wrong is happening. GitFileTree should have NOT generated

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

So ? I put *.methodProperties in .gitignore ? What about .gitattributes for the merge driver ? On 20 January 2016 at 20:19, Mariano Martinez Peck wrote: > Damien, I think the "metadata-less" name is a bit wrong. I think you did > it correct. > The metadataless is that

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

Le 16/01/2016 03:23, Mariano Martinez Peck a écrit : Hi guys, First, let me say that I found very cool that I can do a "git checkout X" from command line, and from Pharo, opening the MC browser detects I am in another branch and everything seems to work. So I guess that's the way I manage

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

On Sat, Jan 16, 2016 at 5:15 AM, Thierry Goubier wrote: > Le 16/01/2016 03:23, Mariano Martinez Peck a écrit : > >> Hi guys, >> >> First, let me say that I found very cool that I can do a "git checkout >> X" from command line, and from Pharo, opening the MC browser

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

Le 16/01/2016 15:06, Mariano Martinez Peck a écrit : On Sat, Jan 16, 2016 at 5:15 AM, Thierry Goubier > wrote: Le 16/01/2016 03:23, Mariano Martinez Peck a écrit : Hi guys, First, let me say that I found very

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

OK, thanks Thierry. BTW, thanks for all the help you have been giving me in the last weeks and for your great GitFileTree :) On Sat, Jan 16, 2016 at 11:14 AM, Thierry Goubier wrote: > Le 16/01/2016 15:06, Mariano Martinez Peck a écrit : > >> >> >> On Sat, Jan 16,

[Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

Hi guys, First, let me say that I found very cool that I can do a "git checkout X" from command line, and from Pharo, opening the MC browser detects I am in another branch and everything seems to work. So I guess that's the way I manage branches? Simply "git checkout X" and then go to MC , and do