StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POGit Syncing: Code Kicked out of One Environment; How to Investigate?
primarykey
Id
7451072
data
AcceptedAnswerId
7451328
AnswerCount
1
ClosedDate
CommentCount
0
CommunityOwnedDate
CreationDate
2011-09-16T22:40:27.010
FavoriteCount
0
LastActivityDate
2011-09-16T23:25:54.820
LastEditDate
LastEditorUserId
0
OwnerUserId
739373
ParentId
0
PostTypeId
1
Score
0
ViewCount
50
LastEditorDisplayName
text
Body
I use Git to help delegate the course of a project, whose code-base is simultaneously developed by a growing team of developers. It does nearly everything we need it to do, however every so often a particular obstacle arises, whose solution escapes me: someones code gets kicked out. At first this question sounds fairly generic, but I'm unaware how to "categorize" this problem, and moreover I'm not sure of the most effective way to diagnose it. I can explain it, however, in a quick play-by-play. Play-by-play Setup: We have three environments: A, B, and C. Each is a clone of a central repository. <ul> <li>A just fixed a feature. B & C still have the broken version.</li> <li>B wants A's code, to make cosmetic changes to the corrected functionality.</li> <li>C is my environment, and I perform the Git tasks.</li> <li>I merge B & C first, because any conflicts will be easier resolved.</li> <li>I push this result, then pull it into A, and resolve conflicts there.</li> <li>I push this result, then pull it into B & C.</li> </ul> Suddenly, A's solution is gone. The feature is, again, broken everywhere. I get the impression that A's new, corrected code was mistakenly replaced. Question #1: Is order the problem? I'm under the impression that the order in which different clones push and pull shouldn't change the result. Am I correct? Or is my problem to do with the order of the pushes and the pulls? Question #2: What tools are useful for diagnosing this issue? Even after using git diff and GUI log tree-views, like in gitk or TortoiseGit, the solution is sometimes still unclear. Are there any other tools in the Git suite, or otherwise, which indicate how code moved, or how preference is determined?
Tags
<git><version-control>
Title
Git Syncing: Code Kicked out of One Environment; How to Investigate?
singulars
PostAcceptedAnswerId
1. PO
 singulars
 PostTypePostTypeId
 PTAnswer
PostParentId
1. This table or related slice is empty.
PostTypePostTypeId
1. PTQuestion
UserLastEditorUserId
1. This table or related slice is empty.
UserOwnerUserId
1. USDaniel B.
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. PO
 singulars
 PostTypePostTypeId
 PTAnswer
VotesPostIdCreationDate
1. This table or related slice is empty.
CommentsPostId
1. This table or related slice is empty.

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.