Am Montag 17 Mai 2010 schrieb Harry van der Wolf: ... >*abort: push creates new remote heads! >(did you forget to merge? use push -f to force) ... > So I did a > 'hg merge' > and then a > 'hg commit' > as hg told me to do so: > Then I did again the > hg push ssh://[email protected]/hgroot/hugin/hugin > > Now I now have the idea that I redid/recommitted Thomas changes. > > Can anybody explain whether this is correct behavior or what I did wrong?
I have seen this often at enblend, it made me cry ..
> And how we should handle this in the future?
I always try to
hg pull
hg update
before commiting. This above mentioned behaviour was one thing I newer liked.
Kornel
--
Kornel Benko
[email protected]
signature.asc
Description: This is a digitally signed message part.
