Source

hgbook-zh_TW / it / examples / ch04-resolve.init.it

<!-- BEGIN ch04/resolve.init -->
<screen><prompt>$</prompt> <userinput>hg init conflitto</userinput>
<prompt>$</prompt> <userinput>cd conflitto</userinput>
<prompt>$</prompt> <userinput>echo primo &gt; miofile.txt</userinput>
<prompt>$</prompt> <userinput>hg ci -A -m primo</userinput>
aggiungo miofile.txt
<prompt>$</prompt> <userinput>cd ..</userinput>
<prompt>$</prompt> <userinput>hg clone conflitto sinistra</userinput>
aggiorno la directory di lavoro
1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
<prompt>$</prompt> <userinput>hg clone conflitto destra</userinput>
aggiorno la directory di lavoro
1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
</screen>
<!-- END ch04/resolve.init -->
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.