Yes, it should work. The same if you repair the repository doing a checkout loading the changes from the repository (there should not be changes) Tell us if you have any questions Thanks! On Thu, Aug 20, 2020 at 2:21 PM Esteban Maringolo <emaringolo@gmail.com> wrote:
Hi Pablo,
Thanks for the answer.
So my workflow of editing files outside of Pharo, committing them, and then adopting the latest commit would be safe? (as long I don't modify files modified by Pharo).
Best regards!
Esteban A. Maringolo
On Thu, Aug 20, 2020 at 6:46 AM tesonep@gmail.com <tesonep@gmail.com> wrote:
Hi, the adopt commit operation has nothing to do with the rebase. It sets the reference commit of the image to the given commit. It does not affect the git repository. The image knows at any moment the commit it has loaded (or it supposed to have loaded). The adopt operation overrides the reference commit with the selected one, it does not affect the loaded code. There is risk of doing so, it changes the commit in the image but without changing the repository nor the loaded code. So, it can produce a detached working-copy, and also it affects the records of changes the image has.
On Thu, Aug 20, 2020 at 5:16 AM Esteban Maringolo <emaringolo@gmail.com> wrote:
Hi,
What does the "Adopt commit" mean?
It seems like a rebase, but I'm not sure.
I often have ongoing changes in my image, and also changes in the filesystem (css, js, Dockerfile, etc.). So what I do is to commit on the filesystem, and then "adopt" the recently created commit, and then commit in Iceberg (and probably push).
Is this okay? Is there any risk in doing this?
Regards!
Esteban A. Maringolo
-- Pablo Tesone. tesonep@gmail.com
-- Pablo Tesone. tesonep@gmail.com