Oct. 17, 2019
5:52 p.m.
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 branch. Can I just pull in the Pull tool without overwriting my changes? Does this do the equivalent of git's "fast forward" if there are no conflicts? If there are conflicts, what happens? _,,,^..^,,,_ best, Eliot