Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I think the problem you are seeing is the side effects of rewriting history.</p> <p>When you rebase, it actually changes the commit hash</p> <p>The hash of a commit is depending on:</p> <ol> <li>the tree of this commit (i.e. the current state of your sources) </li> <li>The hashes of any parents of the commit </li> <li>the commit metadata (author date, author, commit date, committer, commit message, and similar.)</li> </ol> <p><a href="https://stackoverflow.com/a/5145714/800917">source</a></p> <p>So the commits on your first-feature when rebased with origin/master, second-feature was still based on commits from the the original first feature, so when you rebased the second-feature with first-feature, the commits on the first-where different, then the rebase changed the top two commits where changed as well. So you had:</p> <pre><code>1) -- A \ -- B \ -- C After rebase origin/dev 2) -- A -- B' -- A -- B \ -- C Rebase with first-feature 3) -- A' -- B' -- B -- C' </code></pre> <p>At least this is what it appears from your flow you have described. I hope this helps!</p>
    singulars
    1. This table or related slice is empty.
    1. POGit branching from another branch
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. USsparrow
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POGit branching from another branch
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    1. COSo, when I rebased first-feature on dev, and then second-feature on first-feature, and then first-feature was merged into dev, the first-feature under second-feature has a different commit-hash than what was merged into origin dev? (This is confusing). Are there any problems with now rebasing second-feature on origin, and pushing that up? Will it merge into origin okay? It _seems_ as though it will work out. TBH I am not super happy with the flow here and all the rebasing, but then I am not very good with git yet. Seems to go against what most say (don't rebase).
      singulars
      1. PO
      1. USd3vkit
    2. COMore precisely, rebase makes a *copy* of a (or many) previous commits, but since the copies have at least one thing changed—usually a parent commit ID—they are at least subtly different so they necessarily have different "true names" (SHA-1 values). The *old* copy of the commit is still there in the repo, and any commits descending from the old commit, still descend from the old commit. (And, @d3vkit, yes: this is why people avoid rampant rebasing. Very *selective* rebasing is fine. :-) )
      singulars
      1. PO
      1. UStorek
    3. COgit is a very large tool chest, and it has a tool for just about everything you would need to do with managing code. Rebasing is a perfectly good tool in the right context. Usually, I make it a rule not to rebase with published branches and only rebase with my local branches. But to answer your question, it should be ok to rebase your second-feature with origin. Git actions can always be reverted and undone if it doesn't work.
      singulars
      1. PO
      1. USsparrow
 

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