Not updating since new heads added
0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon exits that it wasn't able to merge successfully, so it tells us what commands we'll need to run if we want to redo the merging operation.
- updating webmin
- Telugu live cam girls sexy
- Free adult live camera freetime
- dating a widowed father
- One2one phone chat
- syrian man dating site
pulling from ../my-hello searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files ( 1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) Remember that Mercurial records what the parent of each change is.
If a change has a parent, we call it a child or descendant of the parent. The tip revision is thus a head, because the newest revision in a repository doesn't have any children.
There are times when a repository can contain more than one head.
In Figure 3.3, “Working directory and repository during merge, and following commit”, you can see a representation of what happens to the working directory during the merge, and how this affects the repository when the commit happens.
Our task in resolving the conflicting changes is to decide what the file should look like.