**A** refers to the version your merge target is based on. If you Merge from branch to trunk, &#39;A&#39; will be the previous trunk version.

**B** is what you currently have in your local trunk folder, including local changes.

**C** is the Version you wanna merge on top of B.

Sounds like you&#39;re doing a [three-way merge][1], so A should be the base revision that B and C are based on, B is theirs and C is yours (I believe; B and C might be the opposite, though).


  [1]: http://en.wikipedia.org/wiki/Merge_%28revision_control%29#Three-way_merge

A (BASE) &amp;dash;&amp;dash;&gt; Original file that currently sits in remote repo.  
B (LOCAL) &amp;dash;&amp;dash;&gt; Your file. This shows only your changes as compared to A.  
C (REMOTE) &amp;dash;&amp;dash;&gt; Their file. This shows only their changes as compared to A.

If the changes are on different code lines, you take from both B and C.
If the changes are on same code lines (conflict), you take either from B or C.

**A is your parent revision having B and C as child**.
&lt;br&gt;
Which means B contains the changes done on A by **user1/repo1** and C also contains the changes on A but by other user (**user2/repo2**)

kdiff gives you the option either to select modification from b or c (or take both) or from parent also &#39;A&#39;

If I did `git rebase`, my observation was that:
C - is what in **my_branch** locally ( i.e. was seen in my editor before the rebase started and conflicts occurred).
B - branch I was rebasing **my_branch** on top of (say master branch for example)
A - base revision of B &amp; C (which didn&#39;t matter to me too much in this case)

I&#39;m aware of opening files in readonly mode from shell using `vim -R`, but how to open a file from inside vim in a separate tab (`:tabe &lt;filename&gt;`) in readonly mode?

Thanks for your time.

Open a file in a tab in vim in readonly mode

I&#39;m new to this whole NOSQL stuff and have recently been intrigued with mongoDB.  I&#39;m creating a new website from scratch and decided to go with MONGODB/NORM (for C#) as my only database.  I&#39;ve been reading up a lot about how to properly design your document model database and I think for the most part I have my design worked out pretty well.  I&#39;m about 6 months into my new site and I&#39;m starting to see issues with data duplication/sync that I need to deal with over and over again.  From what I read, this is expected in the document model, and for performance it makes sense. I.E. you stick embedded objects into your document so it&#39;s fast to read - no joins;    but of course you can&#39;t always embed, so mongodb has this concept of a DbReference which is basically analogous to a foreign key in relational DBs.    

So here&#39;s an example:  I have Users and Events;  both get their own document,  Users attend events, Events have users attendees.  I decided to embed a list of Events with limited data into the User objects.  I embedded a list of Users also into the Event objects as their &quot;attendees&quot;.  The problem here is now I have to keep the Users in sync with the list of Users that is also embedded in the Event object.  As I read it,  this seems to be the preferred approach, and the NOSQL way to do things. Retrieval is fast, but the fall-back is when I update the main User document, I need to also go into the Event objects, possibly find all references to that user and update that as well.

So the question I have is, is this a pretty common problem people need to deal with?  How much does this problem have to happen before you start saying &quot;maybe the NOSQL strategy doesn&#39;t fit what I&#39;m trying to do here&quot;?   When does the performance advantage of not having to do joins turn into a disadvantage because you&#39;re having a hard time keeping data in sync in embedded objects and doing multiple reads to the DB to do so?

Too much data duplication in mongodb?

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

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


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

We use SVN at work, but for my personal projects I decided to use Git. So I installed Git yesterday, and I wonder what is the **revision number** equivalent **in Git**.

Let&#39;s say we work on version 3.0.8 and every bug fix has its own revision number we can use when we talk about this bug fix. So if I tag the code in Git to 3.0.8 what then I can use as a revision number or some other more detailed kind of identification? I find the hash not so user friendly for humans.


What is the Git equivalent for revision number?

I&#39;m doing some research on revision control in practice, and there seems to be two names for the same thing in books and papers: Software Configuration Management (SCM), and Version Control Systems (VCS). The former seems to be popular with software engineers / Java programmers, and the latter with from sysadmins, but both appear, at layman&#39;s glance, to mean the same thing. 

On the other hand, in the past I&#39;ve interpreted SCM to mean something like puppet or cfengine. **Can anyone set me straight on these two terms in practice?** Preferably with concrete examples.

What&#39;s the difference between VCS and SCM?

[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 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

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

For example (not sure if most representative example though):

    N &lt;- 1e6
    d1 &lt;- data.frame(x=sample(N,N), y1=rnorm(N))
    d2 &lt;- data.frame(x=sample(N,N), y2=rnorm(N))

This is what I&#39;ve got so far:

    d &lt;- merge(d1,d2)
    # 7.6 sec
    
    library(plyr)
    d &lt;- join(d1,d2)
    # 2.9 sec
    
    library(data.table)
    dt1 &lt;- data.table(d1, key=&quot;x&quot;)
    dt2 &lt;- data.table(d2, key=&quot;x&quot;)
    d &lt;- data.frame( dt1[dt2,list(x,y1,y2=dt2$y2)] )
    # 4.9 sec
    
    library(sqldf)
    sqldf()
    sqldf(&quot;create index ix1 on d1(x)&quot;)
    sqldf(&quot;create index ix2 on d2(x)&quot;)
    d &lt;- sqldf(&quot;select * from d1 inner join d2 on d1.x=d2.x&quot;)
    sqldf()
    # 17.4 sec

What&#39;s the fastest way to merge/join data.frames in R?

I have Git on mac OSX Snow Leopard and I tried to edit my merge and diff tool to use kdiff3 instead of emerge.

But when I try to use it does not launch the GUI of kdiff and keeps me with a cmd based interface.

My setting in gitconfig are: 

    [merge]
         tool = kdiff3
    [mergetool &quot;kdiff3&quot;]
        cmd = /Applications/kdiff3.app/Contents/MacOS/kdiff3
        args = $base $local $other -o $output
        trustExitCode = false
    [diff]
	tool = kdiff3
    [difftool &quot;kdiff3&quot;]
    cmd = /Applications/kdiff3.app/Contents/MacOS/kdiff3
    args = $base $local $other -o $output
    trustExitCode = false

There is obviously something missing but what did I do wrong ?

How to configure kdiff3 instead of emerge as a git mergetool?

I am trying to use KDiff3 to solve conflicts on windows. But when run the merge I get:

KDiff3: &quot;There is a line end style conflict&quot;

And nothing is merged/solved:

![first screenshot][2]

Even though I selected DOS line ending before running the merge:

![second screenshot][1]


Any ideas?

It seems to work if I just save instead of pressing the Merge button. That could be a solution.


  [1]: http://i.stack.imgur.com/28vwR.png
  [2]: http://i.stack.imgur.com/2hmiL.png

KDiff3: &quot;There is a line end style conflict&quot;

Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I uninstalled GitExtension and install the latest version available of [Git][1] and [KDiff3][2].

When I make a merge and have conflicts, I run the following command:

    git mergetool

Then I receive the message:
&gt;  The merge tool kdiff3 is not available as &#39;kdiff3&#39;.

I guess it must be by the KDiff3 path.

**Environment**

 - OS: Windows 10
 - Git 2.6.1.windows.1
 - KDiff3 0.9.98 (64 bit)

**Questions:**

 - What do I have to configure in the .gitconfig file for the command `git mergetool` to open the KDiff3 GUI with the versions **LOCAL**, **REMOTE**, **BASE** and **MERGED** of conflicted file?

 - How can I configure it to use it as a diff tool?

  [1]: https://git-scm.com/downloads
  [2]: http://kdiff3.sourceforge.net



Content Type	Original Author	Original Content on Stackoverflow
Question	smuggledPancakes	View Question on Stackoverflow
Solution 1 - Version Control	Th 00 mÄ s	View Answer on Stackoverflow
Solution 2 - Version Control	eldarerathis	View Answer on Stackoverflow
Solution 3 - Version Control	Nikhil Vartak	View Answer on Stackoverflow
Solution 4 - Version Control	RollerCosta	View Answer on Stackoverflow
Solution 5 - Version Control	Aleks Tkachenko	View Answer on Stackoverflow

What are A, B, and C in KDIFF merge

Version Control Problem Overview

Version Control Solutions

Solution 1 - Version Control

Solution 2 - Version Control

Solution 3 - Version Control

Solution 4 - Version Control

Solution 5 - Version Control

Too much data duplication in mongodb?

Open a file in a tab in vim in readonly mode

Attributions