>�� but I��m trying to understand what is the easiest option to avoid gotcha��s (that more advanced guys can better cope with)

I guess the question is whether you want to handle conflict resolutions directly with git, or through iceberg.

I've been using separate clones for each image for a long time and it works well. Especially when you are also modifying non-smalltalk files in each clone.

Peter

On Mon, Jun 4, 2018 at 7:26 PM, Stephan Eggermont <stephan@stack.nl> wrote:

Esteban Lorenzano <estebanlm@gmail.com>
wrote:
.
> P7 will force you to be in the right branch or you will not be able to
> do�� almost anything :)
> you can have two (or ten) images opened at once and work on them, but at
> a moment you will need to ��repair�� each image to commit.

Ah, nice. How is that guarded against concurrent access, live-lock &
dead-lock?

Stephan