Databases
StackOverflow2013
Postsdbo
POWhy would a user's changes be overwritten without mention of a conflict?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POWhy would a user's changes be overwritten without mention of a conflict?
    primarykey
    data
    text
    <p>I am working on a two person team. I made some changes to a file called PostSet. I pushed those changes. My partner had also made changes to the same file, and even to the same query. He ran </p> <pre><code>git pull --rebase origin master </code></pre> <p>in order to put his changes on top of mine and keep the working history clean, as we always do. Normally we get conflicts if we edit the same line. </p> <p>He was notified of a whole bunch of conflicts relating to some image files (a completely different issue). Just to explain everything, he fixed that problem by using</p> <pre><code>git rm -r path/to/image/dir </code></pre> <p>and then</p> <pre><code>git add -A </code></pre> <p>to add all of those changes to the index. After using</p> <pre><code>git rebase --continue </code></pre> <p>there were no more conflicts. We immediately noticed, however, that the relevant query was now using MY changes, not his. In fact, the entire file PostSet was on an old version after the rebase.</p> <p>Shouldn't there have been some sort of conflict warning about the PostSet file? Is there something we did wrong with the rebase?</p> <p>In short, we can't confidently continue development until we know changes will stop being overridden, so we're fairly frustrated.</p> <p>Thanks a lot,</p> <p>Paragon</p> <p>Edit: We replicated our steps exactly and got the same result.</p> <p>Edit: Given that nobody seems to have any clue, I will likely be reporting this as a bug in git. I'll leave it up for a while longer on the off chance that someone has a wild suggestion.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USParagon
    1. USParagon
    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. POWhy would a user's changes be overwritten without mention of a conflict?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POWhy would a user's changes be overwritten without mention of a conflict?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POWhy would a user's changes be overwritten without mention of a conflict?
      1. USmillimoose
      1. VTFavorite
    1. CONowhere in your description says that your partner changes were commited before the rebase. Is that the case?
      singulars
      1. POWhy would a user's changes be overwritten without mention of a conflict?
      1. USmadth3
    2. COgit wouldn't allow a pull without all existing changes being committed. He committed his changes, then rebased, and his changes were already run-over before he could push back to the github repo.
      singulars
      1. POWhy would a user's changes be overwritten without mention of a conflict?
      1. USParagon
    3. CO1. Seems like a bug that uncommited changes block the rm command and merge conflicts don't 2. I tried the same steps and rm gave a warning about the conflicting file needing a merge 3. Also, I ended without the conflicting file. Is there some option missing in the rm command?
      singulars
      1. POWhy would a user's changes be overwritten without mention of a conflict?
      1. USmadth3
 

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