Le 08/04/2015 13:23, Sean P. DeNigris a écrit :
Dale Henrichs-3 wrote
My mail may have been a bit harsh, so please read my reply to Peter ...
where I think I take a bit more positive tack:)
We are beyond politeness, my friend... Not our first rodeo :)
Dale Henrichs-3 wrote
I am really pressed for time so I don't have the luxury to blue sky
ideas ...
I understand. I was not suggesting anyone do anything. Also, I agree that
methods seem to be the proper level for SCM versioning as they are in the
Smalltalk image. I was simply asking, in light of the appearance that the
merge driver could seemingly ignore the changes to certain files while still
committing them with Git, if it would be feasible to add read-only
one-class-per files "for viewing on GitHub". This is more of a sanity check
to see if I understood what the merge driver makes possible.
The merge driver seemingly ignoring the changes to certain files while
still committing? No, doesn't work that way. The merge driver never commits.
Unless you mean that, in case of conflicts on merging that file, that
the merge driver should be disregarding the conflicts and choose one
version over another... Not sure to see how that would work.
Remember that the merge driver is only called by git merge. Nothing else.
Adding a description file would enter it into the git and make it
tracked as are all other files. And adding a file is really not a big deal.
Thierry
-----
Cheers,
Sean
--
View this message in context:
http://forum.world.st/Metacello-GIT-methodProperties-json-tp4818097p4818323.html
Sent from the Pharo Smalltalk Users mailing list archive at Nabble.com.
