Please take our Survey

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

Re: The new Codeville merge algorithm: msg#00001

version-control.revctrl

Subject:	Re: The new Codeville merge algorithm

Bram Cohen wrote:

> It also can lead to ambiguous clean merges - situations in which *both*
> sides should win.

Sorry, that should have said 'in which *neither* side should win. My bad.
Cases in which both sides should win are simple conflicts.

-Bram

<Prev in Thread]	Current Thread	[Next in Thread>

Previous by Date:	The new Codeville merge algorithm, Bram Cohen
Next by Date:	Re: The new Codeville merge algorithm, Nathaniel Smith
Previous by Thread:	The new Codeville merge algorithm, Bram Cohen
Next by Thread:	Re: The new Codeville merge algorithm, Nathaniel Smith
Indexes:	[Date] [Thread] [Top] [All Lists]

Recently Viewed:
hardware.arm.at... cms.citadel.dev... video.gstreamer... java.facelets.u... misc.basics.qna... web.wiki.instik... network.uip.use... xdg.devel/2003-... tex.bibtex.bibd... finance.quotesp... ietf.zeroconf/2... redhat.blinux.g... suse.db2/2003-0... php.phpesp/2004... uml.devel/2003-... gnome.labyrinth... qnx.openqnx.dev... boot-loaders.gr... db.dataperfect.... audio.audacity.... linux.uclinux.m... editors.j.devel... os.openbsd.tech... kde.users.multi...

Home | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe

Navigation