Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I would love to be proven wrong on this answer but... coming from perforce... this area of git is a bit under developed.</p> <ol> <li><p>Auto merging in git is non-existant. The latest version has basic support for performing a merge using your changes or their changes but that's it. Basically if you edit a portion of a file and someone else edits the same portion of a file... you're on your own for merge resolution. The diff3 format is available (3-way merge) but I believe a unified diff format is the standard. I actually use araxis as the merge tool and have it setup to use 3 way merge when running "git mergetool". Coming from perforce though... I feel like git is way behind in this area.</p></li> <li><p>N/A</p></li> </ol> <p>Update RE: comments</p> <p>I haven't dug deep enough into exactly what git thinks is a conflict and exactly what p4 thinks is a conflict but here's what I've experienced in both.</p> <ul> <li>Git does not ignore white space when doing a merge... although there is talk about this in the future for git. p4 can do this now. Not ignoring white space is a major pain unless everyone on the team agrees on using spaces or tabs and if you'd like to change the indention of a file... (e.g. adding an xml node around other nodes) then this gets old fast.</li> <li>I feel like when I come across merge conflicts in a file... the parts that git says are in conflict using it's unified diff format are larger. When it's only a portion of one line that's changed it will mark larger portions as modified and you need to visually hunt down the changes between the two areas of of the unified diff output. You can kind of get around this using a mergetool though. p4 is able to auto resolve conflicts even if editing the same line.</li> <li>If you're merging long lived topic branches then you're in for a real treat. Without rerere turned on (which is off by default) git will forget that you've already merged that file that was in conflict a week ago and will ask you to merge it again. p4 does this with ease</li> </ul> <p>My answers here are a bit subjective... but I do sorely miss the merging that I had with perforce.</p>
    singulars
    1. This table or related slice is empty.
    1. POIs git's merge conflict resolution more efficient than other SCMs and merge tools?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USClintm
    1. USClintm
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COJust for info, what does perforce do now if you change the same line as someone else has changed in parallel? The last time I used p4 it was marked as a conflict and needed manual resolution (similar to git).
      singulars
      1. PO
      1. USCB Bailey
    2. CO+1 I'm also curious about that- has anything better been invented than a 3 way diff? There seem to be variances in the algorithms(see Guiffy's whitepaper), but if the same line is changed you stuck with a manual conflict.. unless of course there is some AI-based and strongly language-aware merge tool.
      singulars
      1. PO
      1. USinger
    3. COIMHO 'auto merging non existent' is bit strong. It is there - in the usual sense: eg. when using KDiff3, it has a button 'Auto-merge' and that does more or less what GIT does, sometimes better sometimes worse.. But I was wondering if GIT does/should use its extra history information (e.g. order of commits) for making better decisions? (like it knows where code is pasted from, etc..)
      singulars
      1. PO
      1. USinger
 

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.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload