Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I assume that you will be, or have, set up an <code>origin</code> remote to your fork, and the same again for <code>upstream</code> (as described).</p> <p>I would then do a fetch of the <code>upstream</code> so that you have all their branches held locally. You can then make the comparisons between the repos and see if there is a common commit at or near the divergence date.</p> <p>The <code>gitk --all</code> visualisation is useful here. Don't forget that even if you do a rebase the old commit series is still there so you can give it a name</p> <hr> <p>[EDIT] A wordy description.</p> <p>Clearly the merge commit is 'getting in the way' so needs to be massaged <em>away</em> so that the repos can be brought in sync again.</p> <ol> <li>create a <code>temp</code> branch at your current head, so nothing gets lost.</li> <li><code>reset</code> your master branch back to the last common commit between you and upstream.</li> <li><code>reset</code> your feature branch to just before the merge.</li> <li><code>checkout</code> that merge commit to get the working tree as you expect, then</li> <li>switch to your feature branch (without checking out anything!)</li> <li><code>commit</code> that fixed work tree on your <code>feature</code> branch (i.e. no merge).</li> </ol> <p>You now have a clean line on <code>master</code>, a clean but old line on <code>feature</code>, and any post merge developments on <code>temp</code>. if Happy, you should be able to force push this to your <code>origin</code>.</p> <ol> <li><code>pull</code> from upstream - it (i.e. <code>master</code>, etc.) should all fast forward.</li> <li><code>rebase</code> those post merge developments from <code>temp</code> onto <code>feature</code> (if required).</li> <li><code>rebase</code> <code>feature</code> to the last commit you know well on master (should be relatively easy).</li> <li><code>rebase</code> <code>feature</code> (again) to the latest commit on master, fixing up as you go (combine with the last step if it's easy;-).</li> </ol> <p>This should finally give you a clean line of feature development at the head of master, and suitable for pulling upstream without any conflict.</p>
    singulars
    1. This table or related slice is empty.
    1. POGithub rebase upstream/master with origin/master
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USPhilip Oakley
    1. USPhilip Oakley
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POGithub rebase upstream/master with origin/master
      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. VTAcceptedByOriginator
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COYes, origin was set up for me when I cloned my repo in Github for Windows, I only needed to add upstream (confirmed by doing `git remote`, which shows both origin and upstream). What do you mean by common commit? I know the precise commit after which my repo diverged. What can I do with that information?
      singulars
      1. PO
      1. USDav
    2. COIt was a case of mapping where the three different branches diverged from each other to see if there was some conflicts (overlaps) or whether you had independent lines of development (excepting for the merge commits). Is your `topic` branch still one behind the merge to your master?
      singulars
      1. PO
      1. USPhilip Oakley
    3. COI've updated my question to help explain what happened and what I'd like to do, please have a look.
      singulars
      1. PO
      1. USDav
 

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