StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
primarykey
Id
13612155
data
AcceptedAnswerId
0
AnswerCount
0
ClosedDate
CommentCount
0
CommunityOwnedDate
CreationDate
2012-11-28T18:40:26.933
FavoriteCount
0
LastActivityDate
2012-11-28T18:40:26.933
LastEditDate
2017-05-23T11:56:11.990
LastEditorUserId
-1
OwnerUserId
937332
ParentId
13313777
PostTypeId
2
Score
0
ViewCount
0
LastEditorDisplayName
text
Body
No, this is not the expected behaviour. The reason it was leaving all the changes as modified files was because it had "given up" on the merge. Information that I did not know was relevant at the time of the posting -> I had created the repository originally not knowing about putting .DS_Store in the .gitignore file. I have had *.DS_Store there for a long time, but I probably hadn't cleaned up properly after doing that. It looks like there were "many" .DS_Store files in the repository and putting it in the .gitignore file appears to just mean "from now forward", not "from what I did before". So above, Xcode complained about the .DS_Store file being modified and since it didn't know how to resolve conflicts in files of that type, it just gives up. It didn't handle the fact that the file had been deleted already in RepoA, it needed to be deleted in RepoB too. Secondarily, although it said .DS_Store in the file list, it was not the .DS_Store in the main folder, it was one or more .DS_Store files somewhere down the file hierarchy. So no matter how many times I deleted the top level .DS_Store in git via the command line, Xcode was never happy. So I couldn't tell which .DS_Store file it was talking about. Looks like Xcode is not good about having multiple files of the same name in your project. Fix is to follow another <a href="https://stackoverflow.com/questions/107701/how-can-i-remove-ds-store-files-from-a-git-repository">SO post</a> where you find all the .DS_Store's in your hierarchy, git rm them and then git commit all via the command line. Then the Xcode merge will complete and you won't be left with modified files from a pull.
Tags
Title
singulars
PostAcceptedAnswerId
1. This table or related slice is empty.
PostParentId
1. POworkflow confusion after XCode git pull
 singulars
 PostTypePostTypeId
 PTQuestion
PostTypePostTypeId
1. PTAnswer
UserLastEditorUserId
1. USCommunity
UserOwnerUserId
1. USmorejanus
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. 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.