Le 5/9/16 à 11:02, Nicolas Passerini a écrit :
Yes, it can be cryptic. It would be nice that we discuss which is the
best vocabulary to use so that it is clear both for people with or
without a strong git background.
We should use flybyhelp with a large text inside :)
Iceberg does not have a "pull" operation, as it is intended from the
git command line. Instead you have fetch and merge separately
(remember: git pull = git fetch + git merge).
In this way, you first download all new versions from the remote
repository, you can browse them, and then you can decide to:
a. Merge the remote changes into your local branch
b. Load any version, without merging (which in git is called "detached
head").
I thought this way (more similar to current Pharo tools than to the
git command line) is better for our needs, but I could be wrong. Or we
could have both.
Also, one tricky thing here is that "incomming changes" could be two
different things:
- changes in the remote repository but not merged into your current
branch.
- changes in your current branch but not loaded into the image
I am not sure how should be the best way to show that information.
On Sun, Sep 4, 2016 at 8:56 PM, Alexandre Bergel
<[email protected] <mailto:[email protected]>> wrote:
Hi!
I have a question regarding the window:
Why if I want to retrieve the new versions, I need to press the
button “Fetch new versions”. I think I should do a pull ? But
instead, i can do a load or a merge. A bit cryptic…
Cheers,
Alexandre
--
_,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
Alexandre Bergel http://www.bergel.eu
^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
