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/2011-July/112634.html below:

Stop ignoring Mercurial merge conflits files (#12255).

[Python-Dev] cpython (3.2): Stop ignoring Mercurial merge conflits files (#12255). [Python-Dev] cpython (3.2): Stop ignoring Mercurial merge conflits files (#12255).R. David Murray rdmurray at bitdance.com
Fri Jul 29 16:50:57 CEST 2011
On Fri, 29 Jul 2011 15:38:31 +0200, Antoine Pitrou <solipsis at pitrou.net> wrote:
> On Fri, 29 Jul 2011 15:28:44 +0200 > Éric Araujo <merwok at netwok.org> wrote:
> > make clean removes generated files, but *.rej and *.orig are backups,
> > which you may want to save or re-apply.
> 
> What use are these backups really? We are using a (D)VCS, you are not
> losing anything.

As Éric said, the .orig files may contain uncommitted changes.  The
.rej files are information about what parts of the patch were
*not* applied, which is information that is not retained
anywhere else.

--David
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