[Pharo-dev] Iceberg - Merging when there are changes in the working copy

Andrei Chis chisvasileandrei at gmail.com
Tue Jan 8 14:26:38 EST 2019


Hi,

IceCommitish>>#validateCanMerge has the warning: ''Experimental Feature:
merge when there is a dirty working copy. Could cause a loss of your local
changes. Please commit before merge.''. Are there some known situations
when code can be lost?

I'm asking because in releaser (
https://github.com/feenkcom/gtoolkit-releaser) we want to switch (not
checkout) from the `master` branch to the `release` branch and then merge
`master` into `release` running into the above warning.
Switching to `release` branch, does a checkout at the git level, leaving
the image code the same. Hence, the packages that have changed will be
marked as dirty.  So there aren't manual changes just changes caused by
switching to a different branch.

Cheers,
Andrei
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.pharo.org/pipermail/pharo-dev_lists.pharo.org/attachments/20190108/471912d0/attachment.html>


More information about the Pharo-dev mailing list