StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>Since Mercurial 2.4, you can create an bookmark called <code>@</code> and Mercurial will checkout that revision new clones.</p> <p>However, I would still try to stick with using <code>default</code> as the branch where the main development takes place. Doing so will cause the least amount of surprise for developers already used to Mercurial — the wiki <a href="https://www.mercurial-scm.org/wiki/StandardBranching#What_not_to_do" rel="nofollow noreferrer">describes the standard way to use branches</a> in Mercurial.</p> <p>If you follow the conventional advice of using <code>default</code> as the main branch for development, then you should close your feature branch before you merge it back:</p> <pre><code>$ hg update feature-branch $ hg commit --close-branch -m "Feature done, merging into default branch" $ hg update default $ hg merge feature-branch $ hg commit </code></pre> <p>If you haven't done any work at all on the default branch since your started the feature branch, then this merge will be trivial and have no conflicts. Otherwise you'll have to resolve conflicts. If you're sure you want to keep everything from the feature branch, then you can do</p> <pre><code>$ hg merge --noninteractive --tool internal:local feature-branch $ hg revert --all --rev feature-branch </code></pre> <p>instead of just <code>hg merge</code> above. That will make sure that the new commit on <code>default</code> look exactly like the last commit on <code>feature-branch</code>.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload