Databases
StackOverflow2013
Postsdbo
POPushing to remote repository after merge "creates new remote heads" - is that bad?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POPushing to remote repository after merge "creates new remote heads" - is that bad?
    primarykey
    data
    text
    <ol> <li><p>I <code>initialized</code> a Mercurial project on <strong><code>Machine A</code></strong>, <code>committed</code> my changes and <code>uploaded</code> them to a remote repository.</p></li> <li><p>Then I <code>cloned</code> that repository on <strong><code>Machine B</code></strong>, <code>committed</code> some additional changes and <code>uploaded</code> them to the same remote repository.</p></li> </ol> <p>In both cases, I uploaded the changes with the same command:</p> <pre><code>hg push https://username:password@domain/user/repository/ </code></pre> <p>Now I'm back on Machine A and I've <strong><code>pull</code>**ed from the remote repository and **<code>merg</code>**ed any changes between the two changesets using the **<code>KDiff3</code></strong> GUI tool using the commands:</p> <pre><code>hg pull hg merge hg commit </code></pre> <p>However, when I try to push the latest changes from Machine A back to the remote repository after this pull and merge, I get this message:</p> <pre><code>hg push https://username:password@domain/user/repository/ pushing to https://username:password@domain/user/repository/ searching for changes abort: push creates new remote heads! (did you forget to merge? use push -f to force) </code></pre> <p><strong>Why does it say "did you forget to merge"? -- I completed the merge.</strong></p> <p><strong>Is it bad to force the push and create "new remote heads"?</strong></p> <p><strong>If so, how do I avoid this?</strong></p> <p>UPDATE:</p> <p>I ran "<code>hg merge</code>" again and got this output:</p> <pre><code>5 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon </code></pre> <p>So I ran '<code>hg up --clean</code>' and it reported:</p> <pre><code>6 files updated, 0 files merged, 1 files removed, 0 files unresolved </code></pre> <p>Now when I type '<code>hg heads</code>', it says:</p> <pre><code>changeset: 11 tag: tip parent: 9 user: eggdrop date: Tue Oct 20 16:27:44 2009 -0400 summary: Machine A after merge changeset: 10 parent: 7 user: chickensoup date: Thu Oct 15 03:27:23 2009 -0400 summary: Machine B changes to be pulled onto Machine A </code></pre>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USeggdrop
    1. USeggdrop
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POPushing to remote repository after merge "creates new remote heads" - is that bad?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POPushing to remote repository after merge "creates new remote heads" - is that bad?
      1. USDigitalRoss
      1. VTFavorite
    3. VO
      singulars
      1. POPushing to remote repository after merge "creates new remote heads" - is that bad?
      1. This table or related slice is empty.
      1. VTUpMod
    1. CODid you committed the merge?
      singulars
      1. POPushing to remote repository after merge "creates new remote heads" - is that bad?
      1. USavakar
    2. COYes, I resolved all differences and committed the merge. So, when I type "hg status" there is no output because everything local has been checked in.
      singulars
      1. POPushing to remote repository after merge "creates new remote heads" - is that bad?
      1. USeggdrop
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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