Options
SQL Source Control and Git
arcadia65
Posts: 1 New member
I am a bit confused about the updating of local files within the "Linked" directory for a database. As a bit of background, I have a database table that needs elements from both "mine" and "theirs". For some reason, I can't pick which lines I would like to keep from which file. I seem to have been able to do that in the past. I decided to do the merge outside of SQL Source Control. The specific file I am working on contains static data.
If I manually delete the table under "Data Model" "Data" it does not get replaced if I commit my local Database copy. It also does not get replaced if I ask to "Get latest". Is the "Keep Mine" static data just pulled directly from my database and displayed? Where does this information go if I click to "Commit". Is it simply tagged as being committed but not stored in the file system? Where does the information come from when i click to "Get latest"? It isn't in "Data Model" "Data". If I click "Take theirs" and then click Commit, will that store into my local file system?
If I manually delete the table under "Data Model" "Data" it does not get replaced if I commit my local Database copy. It also does not get replaced if I ask to "Get latest". Is the "Keep Mine" static data just pulled directly from my database and displayed? Where does this information go if I click to "Commit". Is it simply tagged as being committed but not stored in the file system? Where does the information come from when i click to "Get latest"? It isn't in "Data Model" "Data". If I click "Take theirs" and then click Commit, will that store into my local file system?
Answers
Hello Arcadia,
Please see see the following documentation of the 'yours' vs 'theirs' behaviour.
https://documentation.red-gate.com/soc/common-tasks/resolve-and-merge-conflicts
There is a seperate section for static data further down that should also be applicable.
It's detailed in the above link, but essentially for practical purposes, the 'take theirs' option is just discarding your changes so that you're free to pull down the latest version.
Naturally if you're using any of the mentioned 3rd party tool to get a row by row merge, the outcome will be different.