Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Your second approach sounds about right--- but how did you invoke rebase? You need to tell it you're changing which is your base revision. I think you need something like</p> <pre><code># on changes-2.6.25.4 # make new branch git checkout -b changes-2.6.28.9 # double-check local changes to transport git log --pretty=oneline v2.6.25.4.. # transport changes to be against new base git rebase --onto v2.6.28.9 v2.6.25.4 # should now have the same changes git log --pretty=oneline v2.6.28.9.. </code></pre> <p>Another possibility to avoid getting dumped out in the middle of a rebase is to take your list of local changes and manually add them to a new branch based on v2.6.28.9 using the "git cherry-pick" command. Actually this is effectively the same as rebasing, but in a sense leaves you more in control of what you're doing.</p> <p>I think your reasoning as to why this is a problem is correct: v2.6.28.9 is not a descendant of v2.6.25.4- so by default rebase would try to include all the changes in v2.6.26..v2.6.25.4 as well as yours, if you simply did "git rebase v2.6.28.9". The one-argument rebase will try to get your local changes as "git log $1..HEAD" and then apply those back on top of "$1"- so you can see this only makes sense if the arg to rebase is a branch which has been updated. If you rebase off the same tag as you did before, nothing happens. If you rebase off a different tag, you get other people's changes mixed in with yours. You need to rebase off one tag onto another.</p>
    singulars
    1. This table or related slice is empty.
    1. POKeeping changes against a moving target (such as Linux) using git
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USaraqnid
    1. USaraqnid
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POKeeping changes against a moving target (such as Linux) using git
      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. COThis seems right thanks for the explanation. I think you made a mistake in the sample code, if you actually do the first checkout, you get a fresh branch against 2.6.28.9, but that isn't what you want at this point, since it no longer contains your local changes and rebasing wouldn't make any sense. If you change it to 'git checkout -b changes-2.6.28.9' rather than 'git checkout -b changes-2.6.28.9 v2.6.28.9' then things work. Things appear to be working, as my first conflict is a legitimate one.. now I'm waiting on stupid auto-garbage collection. Why is git trying to be Java? I can gc...
      singulars
      1. PO
      1. USnosatalian
    2. COArgh, I changed that thinking it was wrong and it was right the first time. Not enough coffee yet this morning. I've never had much trouble with "git gc" taking a long time... but then I'm obsessive about doing it manually after pulling a few revisions so it hardly ever gets auto-launched :)
      singulars
      1. PO
      1. USaraqnid
 

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