StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
primarykey
Id
18011273
data
AcceptedAnswerId
0
AnswerCount
0
ClosedDate
CommentCount
5
CommunityOwnedDate
CreationDate
2013-08-02T07:33:32.267
FavoriteCount
0
LastActivityDate
2015-12-17T21:14:56.440
LastEditDate
2015-12-17T21:14:56.440
LastEditorUserId
4464702
OwnerUserId
1284631
ParentId
11133290
PostTypeId
2
Score
47
ViewCount
0
LastEditorDisplayName
text
Body
There are 4 files involved: <ol> <li><code>$LOCAL</code> The file on the branch where you are merging; untouched by the merge process when shown to you</li> <li><code>$REMOTE</code> The file on the branch from where you are merging; untouched by the merge process when shown to you</li> <li><code>$BASE</code> The common ancestor of $LOCAL and $REMOTE, ie. the point where the two branches started diverting the considered file; untouched by the merge process when shown to you</li> <li><code>$MERGED</code> The partially merged file, with conflicts; this is the only file touched by the merge process and, actually, never shown to you in <code>meld</code></li> </ol> <hr> The <code>$MERGED</code> file is the one that contains the <code><<<<<<</code>, <code>>>>>>></code>, <code>=====</code> (and, maybe, <code>||||||</code>) markers (that delimit conflicts). This is the file that you edit manually to correct conflicts. The manual conflicts editing and the visual conflicts editing are done on different files and presented different informations. When using the mergetool (assume <code>meld</code>), the files that are seeing therein are: <code>$LOCAL</code>, <code>$BASE</code>, <code>$REMOTE</code>. Note that you don't see the <code>$MERGED</code> file, although this is passed as a hidden parameter to <code>meld</code> to write the result of the edit there. In other words, in <code>meld</code>, you are editing the file in the middle, the <code>$BASE</code> file, and you pick all the changes from left or from the right manually. It is a clean file, not touched by the merge process. The only glitch is that, when you save, you do not save into the <code>$BASE</code> file, but in the fourth hidden parameter of <code>meld</code>, that is the <code>$MERGED</code> file (that you do not even see). The <code>$BASE</code> file does not contain any conflicts or partial successful merges because it is not the <code>$MERGED</code> file. In the visual editing, when presenting to you the <code>$BASE</code> file (instead of the <code>$MERGED</code> file) <code>git</code> basically discards all its attempts to do the merging (those attempts are visible, if you want, in the $MERGED file) and lets you to completely do the merging from scratch. The bottom line is that in manual and visual merging conflicts you are not looking at the same files, but the final result is written in the same file (that is the <code>$MERGED</code> file). The manual correction of the conflicts is done on <code>$MERGED</code> because <code>git</code> has no mean to present you three files, so it squashes the information from the three files (<code>$LOCAL</code>, <code>$BASE</code>, <code>$REMOTE</code>) in that <code>$MERGED</code> file. But the visual tools have the means to show you three files: they show you the <code>$LOCAL</code>, <code>$BASE</code>, <code>$REMOTE</code> files. You are picking changes from the <code>$LOCAL</code> and <code>$REMOTE</code> files and you are bringing those into the <code>$BASE</code> file, completely re-building and even overwriting the failed attempt of merging that is the <code>$MERGED</code> file.
Tags
Title
singulars
PostAcceptedAnswerId
1. This table or related slice is empty.
PostParentId
1. POWhich version of the git file will be finally used: LOCAL, BASE or REMOTE?
 singulars
 PostTypePostTypeId
 PTQuestion
PostTypePostTypeId
1. PTAnswer
UserLastEditorUserId
1. This table or related slice is empty.
UserOwnerUserId
1. USuser1284631
plurals
PostLinksPostIdRelatedPostId
1. This table or related slice is empty.
PostLinksRelatedPostIdPostId
1. This table or related slice is empty.
PostsAcceptedAnswerId
1. This table or related slice is empty.
PostsParentIdCreationDate
1. This table or related slice is empty.
VotesPostIdCreationDate
1. VO
 singulars
 PostPostId
 PO
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
2. VO
 singulars
 PostPostId
 PO
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
3. VO
 singulars
 PostPostId
 PO
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
CommentsPostId
1. COI just wanted that there are tools (e.g. beyond compare) that do show all 4 files
 singulars
 PostPostId
 PO
 UserUserId
 USyoniLavi
2. CO@yoniYalovitsky: yes, or p4merge
 singulars
 PostPostId
 PO
 UserUserId
 USuser1284631

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.