Smalltalk › Pharo › Pharo Smalltalk Users

Reverting changes in Iceberg

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

3 messages Options

Evan Donahue

Reverting changes in Iceberg

Hi,

I was trying to merge changes from a collaborator from github into my local image and, through some flurry of menus I didn't quite comprehend, it seems to have blown away their changes and left me a commit ahead with all of their changes deleted. How can I revert back to their change, which I do see in my history, and continue from there without my erroneous most recent commit?

Thanks,

Evan

Guillermo Polito

Re: Reverting changes in Iceberg

Hi Even,

what Pharo version are you using? What Iceberg version (the one that comes by default)?

If you're in Pharo 6 with the default iceberg version, I'd suggest you to:

- update iceberg

- or just fix it from the command line

$ git reset --hard HEAD~1

should do what you want.

If you already have latest iceberg release (because you loaded it, or you are in Pharo 7), that can be done from a playground but not (yet) from the UI.

You can try:

- right click on your repository -> inspect

- Then evaluate:

self branch commit: self branch commit parent.

self headCommit adopt.

Which will do exactly the same as the command line reset --hard does.

On Thu, May 24, 2018 at 10:26 PM, Evan Donahue <[hidden email]> wrote:

Hi,

I was trying to merge changes from a collaborator from github into my local image and, through some flurry of menus I didn't quite comprehend, it seems to have blown away their changes and left me a commit ahead with all of their changes deleted. How can I revert back to their change, which I do see in my history, and continue from there without my erroneous most recent commit?

Thanks,
Evan

Guille Polito

Research Engineer

Centre de Recherche en Informatique, Signal et Automatique de Lille

CRIStAL - UMR 9189

French National Center for Scientific Research - http://www.cnrs.fr

Web: http://guillep.github.io

Phone: +33 06 52 70 66 13

Evan Donahue

Re: Reverting changes in Iceberg

Thanks. Command line didn't occur to me. Functional fixedness.

Evan

--
Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html