Databases
StackOverflow2013
Postsdbo
POgit merging newer branch into older branch?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POgit merging newer branch into older branch?
    primarykey
    data
    text
    <p>Wow, I'm having a heck of a time with git. Here is my situation.</p> <ol> <li><strong>Master</strong> -- all fine in good. Most recent code in production.</li> <li><strong>iss454</strong> -- Originally pulled down remotely. Then I somehow merged master in it, but lost all changes. Unaware of this, I made changes and then pushed those changes. iss454 now looks more like master with a handful of new changes.</li> <li>After I pushed iss454 back up, I realized what I did. Fudge! So I went back and created a new branch for iss454 with the older (and good code) while in iss454: <strong><em>git branch iss454-brian 867821ac</em></strong></li> <li><strong>iss454-brian</strong> -- This is now the original code from remote. </li> <li>Once iss454-brian was created, I got nervous and created a new branch off of iss454 to make sure I didn't lose my new changes. While in iss454, I did <strong><em>git checkout -b iss454-mike</em></strong></li> <li><strong>iss454-mike</strong> -- This is holding my new code that I need to apply on top of iss454-brian. </li> </ol> <p>When I created iss454-brian, I verified that all the code that needs to be there is in fact there. </p> <p>So now I need to take the changes in iss454-mike and apply them to iss454-brian. Simple, right? Yeah, not happening. </p> <p>While in iss454-brian, I did <strong><em>git merge iss454-mike</em></strong> and git did its thing. I thought great, it worked! Until I went to look for the code that needed to be there. Yeah missing. </p> <p>iss454-brian now looks like iss454-mike but missing the code that I need.</p> <p>What the heck is going on!</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USMike
    1. USMike
    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. This table or related slice is empty.
    1. COI'm surprised `iss454-mike` was created in step 5 - sounds like it already existed. If you were going to create it, it would be `git checkout -b iss454-mike`...
      singulars
      1. POgit merging newer branch into older branch?
      1. USCDub
    2. COFixed this to reflect -b
      singulars
      1. POgit merging newer branch into older branch?
      1. USMike
 

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