Tagged Questions
240
votes
8answers
27k views
How and/or why is merging in Git better than in SVN?
I've heard a few places that one of the main ways distributed version control systems shine, is much better merging than traditional tools like SVN.
Is this actually due to inherent differences in how ...
128
votes
3answers
28k views
How to correctly close a feature branch in Mercurial?
I've finished working on a feature branch feature-x. I want to merge results back to the default branch and close feature-x in order to get rid of it in the output of hg branches.
I came up with the ...
105
votes
5answers
13k views
Merging: Hg/Git vs. SVN
I often read that Hg (and Git and...) are better at merging than SVN but I have never seen practical examples of where Hg/Git can merge something where SVN fails (or where SVN needs manual ...
66
votes
3answers
23k views
best practices in mercurial: branch vs. clone, and partial merges?
...so I've gotten used to the simple stuff with Mercurial (add, commit, diff) and found out about the .hgignore file (yay!) and have gotten the hang of creating and switching between branches (branch, ...
61
votes
5answers
22k views
What's the easiest way to commit and push a single file while leaving other modifications alone?
I'm relatively new to Mercurial and my team is trying it out right now as a replacement for Subversion.
How can I commit and push a single file out to another repository while leaving other ...
57
votes
6answers
10k views
Backing Out a backwards merge on Mercurial
How do you reverse the effect of a merge on polarised branches without dying of agony?
This problem has been plaguing me for months and I have finally given up.
You have 1 Repository, with 2 Named ...
27
votes
5answers
3k views
What makes some version control systems better at merging?
I've heard that many of the distributed VCSs (git, mercurial, etc) are better at merging than traditional ones like Subversion. What does this mean? What sort of things do they do to make merging ...
26
votes
3answers
21k views
How to resolve merging conflicts in Mercurial (v1.0.2)?
I have a merging conflict, using Mercurial 1.0.2:
merging test.h
warning: conflicts during merge.
merging test.h failed!
6 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are ...
22
votes
2answers
3k views
Abort a merge in mercurial
I goofed up a merge. I'd like to revert then try again.
Is there a way to revert a merge before it is commited.
hg revert doesn't do what I'd like, it only reverts the text of the files. Mercurial ...
22
votes
3answers
8k views
Undo an hg push (backout?)
I made a big oops, and could use some help undoing it.
We have two repositories-a fairly stable repository, and a repository we're working on changes in. I just made a defect fix in our stable ...
18
votes
1answer
9k views
How to only push to one branch in Hg?
I have a Hg repo with 3 branches in it, but two of them are inactive (since I have already merged them into my default branch). hg heads shows 3 heads, one for each branch, even though hg branches ...
18
votes
2answers
6k views
How does the 3 way merge in Mercurial/Meld work?
I'm working on a project where I have a commit that introduced a feature with major problems that weren't discovered immediately. Now I want to completely remove that revision while keeping the work ...
18
votes
3answers
929 views
When SVN fails to merge and Mercurial succeeds
Before it comes up, I've already looked at several threads on this topic, including these:
Merging: hg/git vs. svn
Mercurial compared to private branches in SVN
Why is branching and merging easier ...
17
votes
2answers
5k views
Use WinMerge as TortoiseHG Merge tool
i am trying to set up WinMerge as the Merge tool into TortoiseHG;
Here is my Mercurial.ini:
; User specific Mercurial config file.
; See the hgrc man page for details.
[ui]
username = Bargio ...
16
votes
3answers
5k views
How to abandon a hg merge?
I'm new to collaborating with Mercurial. My situation:
Another programmer changed rev 1 of a file to replace 4-space indents with 2-space indent. (I.e. changed every line.) Call that rev 2, pushed ...
