Re: [Pharo-dev] How do you merge branches using Iceberg?

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 <marianopeck@gmail.com> 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/>