`hg update -C &lt;one of the two merge changesets&gt;`

After you do `hg merge`, but before `hg commit`, your working copy has two parents: the first parent is the changeset you had updated to before the merge and the second parent is the changeset you are merging with. Mercurial will not let you do `hg merge` again as long as your working copy has two parents.

You have two options on how to proceed:

1. If you want to abort the merge and get back to where you started, then do

        hg update -C .

   This will update the working copy to match the first parent: the `.` always denotes the first parent of the working copy.

2. If you want to *re-merge* some files then do

        hg resolve fileA fileB

   This will re-launch the merge tools just as when you did `hg merge`. The resolve command is good if you find out at `hg merge`-time that your merge tools are configured badly: fix the configuration and run `hg resolve --all`. You can run `hg resolve` as many times as you want until you are satisfied with the merge.

Today there is `hg merge --abort`. See `hg help merge`.

I am newbie in Python facing a problem: How to insert some fields in already existing string?

For example, suppose I have read one line from any file which contains:

    line = &quot;Name Age Group Class Profession&quot;

Now I have to insert 3rd Field(Group) 3 times more in the same line before Class field. It means the output line should be: 

    output_line = &quot;Name Age Group Group Group Group Class Profession&quot;

I can retrieve 3rd field easily (using `split` method), but please let me know the easiest way of inserting into the string?

Insert some string into given string at given index

Is there way to create a border that is only on the top, left, and right sides? 

Border on three sides

I goofed up a merge.  I&#39;d like to revert then try again.  
Is there a way to revert a merge before it is committed?

`hg revert` doesn&#39;t do what I&#39;d like, it only reverts the text of the files.  Mercurial aborts my second attempt at merging and complains original merge is still uncommitted.

Is there a way to undo a merge after an `hg merge` command but before it&#39;s committed?



How to 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 committed?
<code>hg revert</code> doesn't do what I'd like, it only reverts the text of the files. Mercurial aborts my second attempt at merging and complains original merge is still uncommitted.
Is there a way to undo a merge after an <code>hg merge</code> command but before it's committed?

I have read [this thread][1] but I&#39;m wondering how secure such a solution would be? I know that github offers ssh/ssl support and am familiar but could someone give me a breakdown of what sort of internal security they would use to make sure my committed conf/credential files don&#39;t get hacked?

**EDIT**: I&#39;ve read http://help.github.com/security/ but I would like an answer from someone who has worked with multiple repository hosts and has real-world experience with this.


  [1]: https://stackoverflow.com/questions/109440/best-git-repository-hosting-for-commercial-project

How secure would github hosting be for private repositories?

Can someone please explain the difference between the following two options of Tortoise SVN on conflicted files:

 - Resolve conflict using &#39;theirs&#39;.   
 - Resolve conflict using &#39;mine&#39;.

On a side note. Why on earth no one has ever reported this confusing use of terminology as a bug?

Tortoise SVN: Resolve conflict using &#39;theirs&#39;. What does it mean?

Why am I given three choices when merging between my code and someone else&#39;s? 
Shouldn&#39;t there just be my code, the other person&#39;s code, and the output below? 
The documentation for KDIFF doesn&#39;t help me understand.

What are A, B, and C in KDIFF merge

From the man page:


&gt;     Deletes all stale tracking branches under &lt;name&gt;.
&gt;     These stale branches have already been removed from the remote repository
&gt;     referenced by &lt;name&gt;, but are still locally available in &quot;remotes/&lt;name&gt;&quot;.

So I removed a bunch of branches using

    git push origin :staleStuff

and then ran

    git remote prune origin

However, only one single local branch was pruned. Some of these branches were created by me, some by co-workers. Does this indicate that I wasn&#39;t tracking those branches correctly in the first place?



git remote prune – didn&#39;t show as many pruned branches as I expected

When you do your first clone using the syntax

    git clone username@server:gitRepo.git

Is it possible using your local repository to find the name of that initial clone?

(So in the above example, find `gitRepo.git`.)


Finding out the name of the original repository you cloned from in Git

    $ hg status

    M ...
    M ...
    M ...
    ? ...
    ? ...
    ? ...

I need to add all not tracked (? marked) files.  Is it possible?
I can do &quot;hg add *&quot; but I will get many messages unwanted &#39;file already tracked&#39;.

Add all not tracked files at once

Not to be confused with [Mercurial .hgignore for Visual Studio 2008 projects][1]

I was asking whether if that same file can be reused for Visual Studio 2010, or some other extensions, etc should be added to it, &amp; why?


  [1]: https://stackoverflow.com/questions/34784/mercurial-hgignore-for-visual-studio-2008-projects

Mercurial .hgignore for Visual Studio 2010 projects

I understand that it is possible to close a named branch in Mercurial, so that it will not appear in the `hg branches` list:

    hg commit --close-branch -m &#39;close badbranch, this approach never worked&#39;

Is it possible to later re-open the branch if need be?

Is it possible to reopen a closed branch in Mercurial?

I have two branches, default and branch1. By mistake one person in our team merged branch1 with default. The content in branch1 is not yet ready to merge with default (it contains a major rework of the build &amp; deploy environment).

We did an experiment with &#39;hg backout&#39;, backing out the merge (not sure this is the right way to do it). Then the changes from branch1 gets deleted on default, which is fine - but we can not remerge with branch1. 

How should we solve this issue?

How can I back out a merge in Mercurial and later remerge with that branch?

I have a file tracked in Mercurial. I can see its history with `hg log`. How can I see the diffs between its most recent version, and the last checked-in changeset?

View differences between two changesets on one file

I have two lists List&lt;ResultAnalysisFileSql&gt; that I need to combine in third list and remove duplicate values from that lists

A bit hard to explain, so let me show an example of what the code looks like and what I want as a result, in sample I use int type not ResultAnalysisFileSql class.

first_list = [1, 12, 12, 5]

second_list = [12, 5, 7, 9, 1]

The result of combining the two lists should result in this list:
resulting_list = [1, 12, 5, 7, 9]

You&#39;ll notice that the result has the first list, including its two &quot;12&quot; values, and in second_list has an additional 12, 1 and 5 value.


ResultAnalysisFileSql class


 

    [Serializable]
        public partial class ResultAnalysisFileSql
        {
            public string FileSql { get; set; }
    
            public string PathFileSql { get; set; }
    
            public List&lt;ErrorAnalysisSql&gt; Errors { get; set; }
    
            public List&lt;WarningAnalysisSql&gt; Warnings{ get; set; }
    
            public ResultAnalysisFileSql()
            {
    
            }
    
            public ResultAnalysisFileSql(string fileSql)
            {
                if (string.IsNullOrEmpty(fileSql)
                    || fileSql.Trim().Length == 0)
                {
                    throw new ArgumentNullException(&quot;fileSql&quot;, &quot;fileSql is null&quot;);
                }
    
                if (!fileSql.EndsWith(Utility.ExtensionFicherosErrorYWarning))
                {
                    throw new ArgumentOutOfRangeException(&quot;fileSql&quot;, &quot;Ruta de fichero Sql no tiene extensi&#243;n &quot; + Utility.ExtensionFicherosErrorYWarning);
                }
    
                PathFileSql = fileSql;
                FileSql = ObtenerNombreFicheroSql(fileSql);
                Errors = new List&lt;ErrorAnalysisSql&gt;();
                Warnings= new List&lt;WarningAnalysisSql&gt;();
            }
             
            private string ObtenerNombreFicheroSql(string fileSql)
            {
                var f = Path.GetFileName(fileSql);
                return f.Substring(0, f.IndexOf(Utility.ExtensionFicherosErrorYWarning));
            }
    
    
            public override bool Equals(object obj)
            {
                if (obj == null)
                    return false;
                if (!(obj is ResultAnalysisFileSql))
                    return false;
    
                var t = obj as ResultAnalysisFileSql;
                return t.FileSql== this.FileSql
                    &amp;&amp; t.PathFileSql == this.PathFileSql
                    &amp;&amp; t.Errors.Count == this.Errors.Count
                    &amp;&amp; t.Warnings.Count == this.Warnings.Count;
            }
    
    
        }

Any sample code for combine and removing duplicates ?


How to merge 2 List&lt;T&gt; and removing duplicate values from it in C#

Currently when I&#39;m using GIT I create a branch for each job and make various commits before I&#39;m finished. I then merge back with my master branch and push upstream. I&#39;m likely to have several branches at any one time and also flick between them mid-job as things crop up.

But most of these commits are just save points, i.e. not that important in the grand scheme of things. So when I merge the branch, I&#39;d like it if the branch logs didn&#39;t merge with the master logs. 

Is there a way to just merge the log message for commit g below (and not commits c or e)? 



    a [master] 
    |
    b (create branch &#39;job&#39;)
    |\
    | \
    |  c 
    |  |
    d  e
    |  |
    f  g (next step is to merge &#39;job&#39; branch with &#39;master&#39;)

Merge GIT branch without commit log

[Wikipedia][1] says a 3-way merge is less error-prone than a 2-way merge, and often times doesn&#39;t need user intervention. Why is this the case?

An example where a 3-way merge succeeds and a 2-way merge fails would be helpful.


  [1]: http://en.wikipedia.org/wiki/Merge_%28revision_control%29#Three-way_merge

Why is a 3-way merge advantageous over a 2-way merge?

I&#39;ve read about some tricks with merge in https://stackoverflow.com/questions/1807036/git-merging-public-and-private-branches-while-while-keeping-certain-files-intact and others and not found a solution.

In my case I&#39;m feeling need to do opposite merge strategy. In parallel development I have to keep some files same across the arbitrary branches. From other side I do not want to do squash or no-commit merge, while difference are significant and could break current state of testing branch. 

What I want something like 

`git checkout testing`

`git merge config.xml -b development` or `git merge config\*.xml -b development`

I guess this is like `git merge-files ...` command, but second file delivered from the branch, not from the filesystem.
Is it possible? or may be there is a kind of workaround? submodules? attributes?

Thanks

git partial merge, not whole branch

How can I make `git push` to push not only to `origin` but also another remote repository?

as `git push` is only an alias for `git push origin`, can I alias git push to push to 2 remote repositories at once (with just that one command)?

I’m not looking for a non-git script here but would like to set this up for my local repository in git.

When I tried it with post-push scripts I failed.

git push to multiple repositories simultaneously

We now have a &quot;stiging&quot; branch, where &quot;staging&quot; seems to be a far better semantic fit. What&#39;s a good strategy for handling this?

Mercurial: Can I rename a branch?

I&#39;ve renamed a couple of files using `git mv`, used `git stash`, had a quick look at HEAD (without changing it) then did `git stash pop` to get the whole lot back again. My moves had disappeared from the commit list, so I redid them with `git rm` and the commit message claimed git had spotted the rename was a rename. So I thought no more of it.

But now, post-commit, I can&#39;t get at the history of the moved files! Here&#39;s what git says about the commit in question:

    ~/projects% git log --summary
    commit de6e9fa2179ae17ec35a5c368d246f19da27f93a
    Author: brone
    Date:   Wed Dec 8 22:37:54 2010 +0000
    
        Moved R_DebugUI into runtime
    
     delete mode 100644 test/R_DebugUI_iOS.h
     delete mode 100644 test/R_DebugUI_iOS.m
     create mode 100644 system/runtime/src/R_DebugUI_iOS.h
     create mode 100644 system/runtime/src/R_DebugUI_iOS.m

     &lt;&lt;snip older commits&gt;&gt;
     ~/projects%

I&#39;m now trying to get the history of one of these moved files, so I can look at an old version, but I don&#39;t get anything very useful:

    ~/projects/system/runtime/src% git log --follow --find-copies-harder -M -C R_DebugUI_iOS.m
    commit de6e9fa2179ae17ec35a5c368d246f19da27f93a
    Author: brone
    Date:   Wed Dec 8 22:37:54 2010 +0000
    
        Moved R_DebugUI into runtime
    ~/projects/system/runtime/src% 

(I&#39;ve also tried it without `-M`, `-C` and `--find-copies-harder`, but to no avail.)

I can get its history under its old name, which stops at the point it was deleted from its old location:

    ~/projects% git log --summary --follow --find-copies-harder -M -C -- test/R_DebugUI_iOS.m
    commit de6e9fa2179ae17ec35a5c368d246f19da27f93a
    Author: brone
    Date:   Wed Dec 8 22:37:54 2010 +0000
    
        Moved R_DebugUI into runtime
    
     delete mode 100644 test/R_DebugUI_iOS.m
    
    commit 32a22d53c27e260714f759ecb3d3864e38b2e87f
    Author: brone
    Date:   Tue Dec 7 23:52:51 2010 +0000
    
        Can set debug UI&#39;s alpha.
    
    &lt;&lt;snip older commits&gt;&gt;
    ~/projects%

So I&#39;m not completely stuck this time, but I wouldn&#39;t fancy having to do this kind of thing all the time. (I anticipate having a fair number of files that will move at least once in their life.)

Am I doing something wrong? The old copy of the file and the new copy are 98.8% the same (2 lines out of 166 changed). My understanding is that git should be able to track the file in this case, because it infers rename operations rather than storing them explicitly, and the files are similar enough that I believe it should consider them the same.

Is there anything I can do to fix this?


Why might git log not show history for a moved file, and what can I do about it?

I can see why distributed source control systems (DVCS - like Mercurial) make sense for open source projects.

But do they make sense for an enterprise? (over a centralized Source Control System such as TFS)

What features of a DVCS make it better or worse suited for an enterprise with many developers? (over a centralized system)

Distributed Version  Control Systems and the Enterprise - a Good mix?

Myself and one other developer had been merging and pushing our work to a non-master branch called toolwork. That way, we didn&#39;t impact the rest of the team. My topic branch was called DPM-93 and my git workflow was this.

    # do some work
    git checkout DPM-93
    git commit -m &quot;did some work&quot;

    # catch up
    git checkout toolwork
    git pull origin toolwork

    # rebase my topic branch
    git checkout DPM-93
    git rebase toolwork

    # merge and push my changes
    git checkout toolwork
    git merge --no-ff DPM-93
    git push origin toolwork

That was mostly working fine until I accidently issued these git commands

    git checkout toolwork
    git pull origin master

At that point, a bunch of new stuff showed up in branch toolwork and I&#39;m not sure how to get rid of it short of deleting my workspace and re-cloning from the repo.

Is there any way to back this out to the state before the pull?


Git pull into wrong branch

What is the right way to undo a rename in git, like:

    git mv file1 file2

Undo git mv (rename)

One of the new features in Vim 7.3 is &#39;persistent undo&#39;, which allows for the undotree to be saved to a file when exiting a buffer.

Unfortunately, I haven&#39;t quite been able to get it properly enabled, or I must be using it wrong.  Here&#39;s what I&#39;ve tried so far:

I added the following to ~/.vimrc


    set undofile                &quot; Save undos after file closes
    set undodir=$HOME/.vim/undo &quot; where to save undo histories
    set undolevels=1000         &quot; How many undos
    set undoreload=10000        &quot; number of lines to save for undo

After this, I supposedly should be able to open any file, edit it, then save-close it, and when I open it again I should be able to undo/redo as if I&#39;d never left.  Unfortunately, this doesn&#39;t seem to be the case, as no undofile is ever written. 

Notes:

1. I&#39;m on Win 7 using Vim 7.3 from the Vim without cream project. Persistent undo is baked-in.

2. $HOME/.vim/undo exists on my file system


Using Vim&#39;s persistent undo?

I would like to undo my git pull on account of unwanted commits on the remote origin, but I don&#39;t know to which revision I have to reset back to.

 How can I just go back to the state before I did the git pull on the remote origin? 

Content Type	Original Author	Original Content on Stackoverflow
Question	deft_code	View Question on Stackoverflow
Solution 1 - Version Control	Omnifarious	View Answer on Stackoverflow
Solution 2 - Version Control	Martin Geisler	View Answer on Stackoverflow
Solution 3 - Version Control	mljrg	View Answer on Stackoverflow

How to abort a merge in mercurial?

Version Control Problem Overview

Version Control Solutions

Solution 1 - Version Control

Solution 2 - Version Control

Solution 3 - Version Control

Border on three sides

Insert some string into given string at given index

Attributions