A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://mail.python.org/pipermail/python-dev/2014-May/134624.html below:

[Python-Dev] Merge conflicts from unmerged 3.4 commits, what do I do?

[Python-Dev] Merge conflicts from unmerged 3.4 commits, what do I do? [Python-Dev] Merge conflicts from unmerged 3.4 commits, what do I do?Terry Reedy tjreedy at udel.edu
Tue May 20 21:50:31 CEST 2014
On 5/19/2014 2:08 AM, Terry Reedy wrote:
> On 5/19/2014 1:31 AM, Raymond Hettinger wrote:

>> To get my repo back into a usable state, I ran "hg update --clean"

> py35% hg update --clean
> % hg update --clean
> abort: index 00changelog.i unknown format 2!

After exiting Workbench and rebooting, update --clean worked fine.

-- 
Terry Jan Reedy

More information about the Python-Dev mailing list

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4