> On 12 Dec 2017, at 14:03, Mariano Martinez Peck <[email protected]> wrote: > > mmmmm ok. And let me ask (I don't have another example at hand now to test) > ... with metacello integration enabled, would that ALSO reload the packages > from git into my image?
no > or it would only do the git-side of the merge ? yes > > Thanks in advance, > > On Tue, Dec 12, 2017 at 9:47 AM, Esteban Lorenzano <[email protected] > <mailto:[email protected]>> wrote: > is not very clear, but you can use the history window for that (yeah, it > needs to be better, etc., etc.) > > Esteban > > >> On 12 Dec 2017, at 13:32, Mariano Martinez Peck <[email protected] >> <mailto:[email protected]>> wrote: >> >> Let's say I have xxx and then I created branch xxx-mariano. Every in a >> while, I want to merge latest xxx into my xxx-mariano. I haven't found a way >> to do this in Iceberg (I am using 0.6.2 on Pharo 6.1). I had to go to >> console, do the git merge there and then from Iceberg I had to "reload all >> packages". >> >> Is there a better way of doing this? >> >> Thanks, >> >> >> -- >> Mariano >> http://marianopeck.wordpress.com <http://marianopeck.wordpress.com/> > > > > > -- > Mariano > http://marianopeck.wordpress.com <http://marianopeck.wordpress.com/>
