StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POFetching branch from repository and merging overwriting local changes, doesn't seem to work when checking diff
primarykey
Id
17922199
data
AcceptedAnswerId
17922373
AnswerCount
2
ClosedDate
CommentCount
0
CommunityOwnedDate
CreationDate
2013-07-29T10:55:21.137
FavoriteCount
0
LastActivityDate
2013-07-29T11:03:35.077
LastEditDate
2017-05-23T11:57:32.040
LastEditorUserId
-1
OwnerUserId
527706
ParentId
0
PostTypeId
1
Score
0
ViewCount
229
LastEditorDisplayName
text
Body
I created a new repository which has exactly the production content. I want to have this content in my local devel environment. So I need to get that content from the repository. What I did was, in my local master branch: <ol> <li>get the content (in branch origin/master) git fetch</li> <li>merge and overwrite my local master branch (as it's explained in this question <a href="https://stackoverflow.com/questions/14275856/git-merging-but-overwriting-changes">Git: Merging but overwriting changes</a>). git merge -X theirs origin/master</li> <li>commit changes git commit -am 'merged overwriting form origin/master'</li> </ol> but then when I do <pre><code>git diff origin/master </code></pre> I should see no differences, but I still see them. Someone knows why? There are <a href="https://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull">other ways to force git overwrite files on pull</a> I can try, but I'd like to understand what I'm doing wrong.
Tags
<git><git-merge>
Title
Fetching branch from repository and merging overwriting local changes, doesn't seem to work when checking diff
singulars
PostAcceptedAnswerId
1. PO
 singulars
 PostTypePostTypeId
 PTAnswer
PostParentId
1. This table or related slice is empty.
PostTypePostTypeId
1. PTQuestion
UserLastEditorUserId
1. USCommunity
UserOwnerUserId
1. USde3
plurals
PostLinksPostIdRelatedPostId
1. PL
 singulars
 LinkTypeLinkTypeId
 LTLinked
2. PL
 singulars
 LinkTypeLinkTypeId
 LTLinked
PostLinksRelatedPostIdPostId
1. This table or related slice is empty.
PostsAcceptedAnswerId
1. This table or related slice is empty.
PostsParentIdCreationDate
1. PO
 singulars
 PostTypePostTypeId
 PTAnswer
2. 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.