Re: [Pharo-dev] Doing the equivalent of "fast forward" with Iceberg

2019-10-18 Thread Max Leske
Hi Eliot, First, save your image ;) Then you should be able to fetch the changes from remote, if you haven't done so yet, and then *merge*. That should apply the changes without distroying your existing changes. You'll also get a chance to review and select the changes that will be applied

[Pharo-dev] Doing the equivalent of "fast forward" with Iceberg

2019-10-17 Thread Eliot Miranda
Hi All, I'm involved in a team project using Pharo 7.1. I have some uncommitted changes in a package that others have committed to. I want to pull their latest commits without overwriting mine and because my changes are incomplete I don't yet want to commit, and hence don't want to create a