Databases
StackOverflow2013
Postsdbo
POgit synchronization of rebased branches
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POgit synchronization of rebased branches
    primarykey
    data
    text
    <p>I recently had a <a href="https://stackoverflow.com/questions/2165844/git-repository-setup-for-development-from-two-machines">question answered</a> about a multi-computer git development setup, and the solution I got there did solve my situation with the <code>master</code> branch, but not side branches based off the master.</p> <p>Here's my current setup:</p> <pre><code>A--B--C--D master \ E--F--G--H BUG_37 </code></pre> <p><code>BUG_37</code> is a branch that is developing a fix to an optional tracked bug for a feature request in the system, and will eventually be merged into the master line, but is separate for the time being. With the repository in this state, one one machine, I made some changes to the <code>master</code> branch:</p> <pre><code>A--B--C--D--I--J--K master \ E--F--G--H BUG_37 </code></pre> <p>I then rebased the <code>BUG_37</code> branch onto <code>master</code>, to ensure that it's working as an enhancement to the most current changes:</p> <pre><code>A--B--C--D--I--J--K master \ E1--F1--G1--H1 BUG_37 </code></pre> <p>Let's say that rebase had a few conflicts that needed to be manually fixed before the rebase was final. If I push those changes to a remote repository, and now wish to pull changes down onto another development system that has the original setup still, what's the best way to do so? <code>git pull --rebase</code> will run the rebase again, and I'll have to manually go through the conflicts I went through the first time, right? And if I make a slight mistake going through the conflicts again, such that E1-H1 are slightly different in this new system, I'll get the repository even more out of sync.</p> <p>How do I take a local repository in the original state and the remote repository in the third state, and have the local repository be updated to exactly match the remote repository (trashing changes E-H and moving the HEAD of <code>BUG_37</code> to the new location)?</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USMidnightLightning
    plurals
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POgit synchronization of rebased branches
      1. USTomas Markauskas
      1. VTFavorite
    2. VO
      singulars
      1. POgit synchronization of rebased branches
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POgit synchronization of rebased branches
      1. This table or related slice is empty.
      1. VTUpMod
    1. This table or related slice is empty.
 

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