Databases
StackOverflow2013
Postsdbo
POmerge deletes and adds wrong files
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POmerge deletes and adds wrong files
    primarykey
    data
    text
    <p>Before you begin spewing git commands, I use Windows 7-64bit with TortoiseGit (currently v1.7.11.3) exclusively as I am new to Git. </p> <p>My DEV branch is older than current remote master and I update DEV, and resolve conflicts.<br> DEV branch has pushed commits to remote DEV branch, thus <code>rebase</code> is not possible - as I understand it.</p> <p>Why does this behaviour happen and how can I avoid it ?</p> <ol> <li><code>Checkout master</code> (switch to local master)</li> <li><code>Pull origin master</code> (No conflicts)</li> <li><code>Checkout DEV</code> (switch to dev branch)</li> <li><code>Merge master</code> (apply local master changes into local DEV branch)</li> <li>Fix conflicts and <code>commit</code> modified files (both auto-merged and fixed conflict files)</li> </ol> <p>When I open the <code>log</code> then I see "parent 1" files as in the commit window AND "parent 2" files, which werent shown. Here is the odd part, files that the (local/remote is same) master had <em>deleted</em> are now <strong>added</strong> and new files are <strong>deleted</strong>.<br> Additionally, "parent 2" files did not produce any conflicts despite some <strong>should</strong>!</p> <p>The new/deleted files work the opposite of what I expected. Why is that ?<br> If a file is new in master and I merge into DEV branch, then I expect it to exist after the merge.<br> My guess is that DEV branch is considered primary, and not the branch (master) I merge into DEV.</p> <p>I do not have the option to use <code>Revert</code> to re-create deleted files (those that are actually new in master).</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USKim
    1. USKim
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POmerge deletes and adds wrong files
      1. This table or related slice is empty.
      1. VTUpMod
    1. COIs it possible that at some stage you have reverted a merge? If so then you will find that re-merging will cause you this kind of problem, you will need to revert the revert. (not making this an answer, as I am making a possible assumption about what you may have done)
      singulars
      1. POmerge deletes and adds wrong files
      1. USTim Jarvis
    2. CODEV branch have not previously been merged with master, so no reverted merge.
      singulars
      1. POmerge deletes and adds wrong files
      1. USKim
    3. COThere's a reason why you're expected to speak console commands: it's less ambiguous than describing UI actions in prose, and would let you create a [SSCCE](http://sscce.org/) to let us reproduce your problem. I'm all for IDEs and GUI tools, but restricting yourself to them makes it harder to describe your problems *precisely*.
      singulars
      1. POmerge deletes and adds wrong files
      1. USmillimoose
 

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.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload