how to revert update operation

[Adeodato Simó]

* Robert Collins [Wed, 19 Jul 2006 10:25:34 +1000]:


> But the goal statement is still identical:
>  - set your basis to be the tip of the master
>  - turn all your local changes into a merge into the master
                                 ^^^^^^^^^^^^

Maybe this sounds stupid, but why that? Is just it can't be implemented
in other way, or don't you agree that users would expect/like just
having their commits "pushed" (instead of merged) after upgrading to the
tip of master? (Though I don't know how/when would one handle
conflicts.)

Just curious.

> Which is why --local commits become a pending merge.

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
                     Listening to: Joan Manuel Serrat - Porque la quería