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 branches? Simply "git checkout X" and then go to MC , and
do a "load" of the last version of the repo? (or another image, whatever).
Yes, exactly.
The problem is now with merging. Not necessary about the metadata ( I
guess we have less metadata conflicts with Metadata-less GitFileTree
right???) , but real code changes conflicts between branches. How do you
manage this? You manage everything at Git level using git and text editors?
yes, or with git gui tools, or with the github interface (if there is no
conflict). The only thing a bit problematic are the eventual conflicts,
but, in that metadata-less format, they are less frequent and easier to
solve.
I cannot think how to do that from MC browser "Merge" because MC sees
only one repo associated to one current branch.
It is possible to do the merge in MC (think of merging your current
working copy and the top of the branch) but they won't be recorded in
the git log as a merge.
Thierry
Any pointer is appreciated.
--
Mariano
http://marianopeck.wordpress.com
