StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
primarykey
Id
15177544
data
AcceptedAnswerId
0
AnswerCount
0
ClosedDate
CommentCount
1
CommunityOwnedDate
CreationDate
2013-03-02T17:50:38.053
FavoriteCount
0
LastActivityDate
2013-03-02T17:56:27.080
LastEditDate
2013-03-02T17:56:27.080
LastEditorUserId
380757
OwnerUserId
380757
ParentId
15177389
PostTypeId
2
Score
1
ViewCount
0
LastEditorDisplayName
text
Body
When I've worked in a multi-user project this is how the workflow goes: <ul> <li>Guy A makes changes in local repo -> Push changes to remote repo</li> <li>Guy B makes changes in local repo -> Push changes to remote repo (It would fail here)</li> <li>Guy B does a <code>git fetch</code> followed by <code>git merge</code> or a <code>git rebase</code> so that his changes are merged with the changes from the remote. Guy B should immediately push these changes to the remote</li> <li>Guy A does some more changes in his local repo -> Push changes (It would fail again). He follows a similar set of steps to Guy B on merging or rebasing.</li> </ul> And speaking in Github terms, the concept of pushing changes to remote repo is handled as a <code>pull request</code> in github. When someone sends a pull request to some branch in some repo, it is the requester's responsibility to do the merge/rebase of his changes against this target and then send the <code>pull request</code>. If the user receiving the pull request sees a lot of conflicts either because the requester didn't take enough pains to do the merges or because there were prior pull requests he had to take care of, which now causes conflicts, then the owner can ask the requester to send an updated <code>pull request</code> on top of the latest changes. In other words, the person receiving the pull request would usually be happy only to accept <code>fast-forward merges</code>, but there are few minor exceptions.
Tags
Title
singulars
PostAcceptedAnswerId
1. This table or related slice is empty.
PostParentId
1. POGit Fork/Merge Conflicts?
 singulars
 PostTypePostTypeId
 PTQuestion
PostTypePostTypeId
1. PTAnswer
UserLastEditorUserId
1. USTuxdude
UserOwnerUserId
1. USTuxdude
plurals
PostLinksPostIdRelatedPostId
1. This table or related slice is empty.
PostLinksRelatedPostIdPostId
1. This table or related slice is empty.
PostsAcceptedAnswerId
1. POGit Fork/Merge Conflicts?
 singulars
 PostTypePostTypeId
 PTQuestion
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
 VTAcceptedByOriginator
CommentsPostId
1. COHmmmm that seems like the perfect solution. I had no idea pushing to the remote repo could fail when there are conflicts. Thanks for clearing it up, I understand perfectly well now.
 singulars
 PostPostId
 PO
 UserUserId
 USmuyiwamat

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.