abort: unsynced remote changes?
I got a warning like this
abort: unsynced remote changes!
How do I 1) See what's the difference? hg diff? hg status? 2) Harmonize the code?
Thanks in advance. Here's what I got running hg inspecting the heads
$ hg heads
ändring: 192:e571b17295e9
märke: tip
förälder: 175:f50d4c4461e5
användare: tekniklas
datum: Sat Jan 08 04:45:07 2011 +0000
kortfa开发者_C百科ttat: twitter support added
ändring: 191:9e419ce3e7e1
användare: tekniklas
datum: Wed Mar 09 12:56:27 2011 +0000
kortfattat: adsense maps
ändring: 159:f8d974793b12
förälder: 157:ef1d955b9236
användare: tekniklas
datum: Sat Dec 18 17:05:45 2010 +0000
kortfattat: remove
ändring: 89:008a2ac46b4f
användare: tekniklas
datum: Sun Aug 01 07:10:40 2010 +0000
kortfattat: classifiedsmarket/market/market_ad_preview.html
ubuntu@ubuntu:/media/Lexar/montao$
You have to pull latest changes before pushing:
hg pull
To view differences before pull:
hg in
After pull you have to merge changes you've pulled with the changes you're trying to push:
hg merge
After merge you'll have to commit your merge:
hg commit
And finally push without errors:
hg push
Just do a
hg incoming
You will see the list of changes that are available in the remote side
精彩评论