![]() ![]() Mercurial doesn't have a built-in facility for handlingĬonflicts. Our task in resolving the conflicting changes is to Started with a single version of the file then we made someĬhanges while someone else made different changes to the same This updates the working directory so that itįigure 3.4, “Conflicting changes to a document” illustratesĪn instance of two conflicting changes to a document. To start a merge between the two heads, we use theĠ files updated, 1 files merged, 0 files removed, 0 files unresolved C would revert any uncommitted changes in the Tortoisehg upgrade update#(Incidentally, forcing the update with hg update Want to do a merge, unless we force it to do so. ![]() It won't update the working directory when it thinks we might Mercurial is telling us that the hg update command won't do a merge What happens if we try to use the normal hg update command to update to theĪbort: crosses branches (use 'hg merge' or 'hg update -C') * not covered by patents in the United States or other countries.Īnd here is our slightly different version from the other * Placed in the public domain by Bryan O'Sullivan. Illustrated in Figure 3.1, “Divergent recent histories of the my-hello and my-new-hello Histories of the two repositories have also diverged, as $ my-text-editor hello.c $ hg commit -m 'A new hello for a new day.' ![]() $ hg clone hello my-new-helloĢ files updated, 0 files merged, 0 files removed, 0 files unresolved We'll begin byĬloning yet another repository (see how often they spring up?)Īnd making a change in it. Needs to merge one piece of her own work withīecause we need to merge often, Mercurial makes Tasks for a single project at once, each safely isolated in They want the shared repository to contain both theĬynthia frequently works on several different Aliceįixes a bug in her repository Bob adds a new feature in Repository for a project they're collaborating on. Alice and Bob each have a personal copy of a ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |