Databases
StackOverflow2013
Postsdbo
POGit commit confusion between branches and master
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit commit confusion between branches and master
    primarykey
    data
    text
    <p>I've gotten myself in a bit of a tangle with GitHub (for Mac, though I doubt that's relevant).</p> <p>I am only a recent convert to Git, so it remains an unknown in many respects, and today was the first time I'd had a reason to have two branches active at the same time.</p> <p>I'm not sure what happened, but a merge between one of the branches and master didn't go according to plan (somehow, the commit summary got lost while merging hotfix_7.0 with master), so I undid the commit. However, something then went wrong.</p> <p>Branch update_4.0 consists of:</p> <pre><code>application/modules/bookings/controllers/inspector.php application/modules/bookings/models/data_bookings.php application/modules/bookings/views/users/administrators/bookings/adjust.php application/modules/invoices/controllers/invoices.php application/modules/invoices/views/manage.php application/modules/search/controllers/assets/invoices.php application/modules/search/models/data_search.php </code></pre> <p>Branch hotfix_7.0 consists of:</p> <pre><code>application/modules/bookings/controllers/bookings.php application/modules/bookings/controllers/inspector.php application/modules/search/models/data_search.php application/modules/venues/models/data_venues.php </code></pre> <p>When I switch to update_4.0, there are no files pending a commit, and the same for hotfix_7.0. But when I switch to master, the files for update_4.0 appear as pending a commit. Why? And — more importantly — what am I supposed to do next, to remediate this?</p> <p>Update: based on the request of @twalberg, here's the branch structure data:</p> <pre><code>* 869e2f1 (HEAD, origin/hotfix_7.0, master, hotfix_7.0) An adjustment to the Search | * c1e4c04 (update_4.0) Adjustments to Bookings, Invoicing, and Search |/ * d2413f9 (origin/master, update_3.0) Update an Invoice PDF * 6a77f1e (hotfix_6.0) General fixes * fb04b7e (update_2.0) Advanced Search * c8222fe (hotfix_5.0) Caching * 3baea6a (feature_5.0) Caching | *-. 5c08c19 (refs/stash) On hotfix_4.0: GitHub: stashing before switching branches. | |\ \ |/ / / | | * 9a6cd92 untracked files on hotfix_4.0: 0ed797b Invoice date range | * e7e4bbd index on hotfix_4.0: 0ed797b Invoice date range |/ * 0ed797b (hotfix_4.0) Invoice date range * 4d9640d (hotfix_3.0) A fix to one of the search functions database methods, and the incl * 8ee9f92 (feature_4.0) Users can now switch between Clients from anywhere in the system w * 8d8752a (feature_3.0) In an effort to improve the invoicing process, I've made several a * 2cff420 (hotfix_2.0) Switching references to the Commission for Venues column in Invoici * 2403093 (feature_2.0) Statuses for Signatures, which allows the User to filter them in m * 6572680 (hotfix_1.0) A conditional statement was checking against a string value as if i * 6705899 (update_1.0) Alphabetical listing of Signatures for messages. * 283bde4 (feature_1.0) Ability to edit group options in addition to group privileges for * 79ded64 To Book 3 </code></pre> <p>Update: based on the request of @Ilion, here's the branch structure data:</p> <pre><code># On branch master # Your branch is ahead of 'origin/master' by 1 commit. # # Changes not staged for commit: # (use "git add &lt;file&gt;..." to update what will be committed) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # # modified: application/modules/bookings/controllers/inspector.php # modified: application/modules/bookings/models/data_bookings.php # modified: application/modules/bookings/views/users/administrators/bookings/adjust.php # modified: application/modules/invoices/controllers/invoices.php # modified: application/modules/invoices/views/manage.php # modified: application/modules/search/controllers/assets/invoices.php # modified: application/modules/search/models/data_search.php </code></pre>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USWayne Smallman
    1. USWayne Smallman
    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. COWhat is your `core.autocrlf` setting? Have you recently changed it?
      singulars
      1. POGit commit confusion between branches and master
      1. UScdhowie
    2. COCan you show the output from `git log --oneline --graph --decorate --all -20`? That should give a picture of how your branches currently relate to one another.
      singulars
      1. POGit commit confusion between branches and master
      1. UStwalberg
    3. CO@cdhowie I don't even know what that is, which perhaps of answers your question.
      singulars
      1. POGit commit confusion between branches and master
      1. USWayne Smallman
 

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