Databases
StackOverflow2013
Postsdbo
POGit rebase continually fails and requires manual merge intervention
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit rebase continually fails and requires manual merge intervention
    primarykey
    data
    text
    <p>I am having an issue with rebasing from master on to a 'deploy' branch within one of my repositories.</p> <p>My repo is setup as follows:</p> <pre><code>master - of course, the main branch deploy - a branch created where files like Capfile, deploy.rb etc are created and configured - these changes will NEVER be merged back into Master </code></pre> <p>Generally my workflow is:</p> <ol> <li>Do development on the master branch... test, smile, commit.</li> <li>Checkout the <code>deploy</code> branch</li> <li>Execute <code>git rebase master</code> on the deploy branch - this used to work without a problem</li> <li>Push to remote and then execute <code>cap deploy</code></li> <li>Relax</li> </ol> <p>The problem I am now having is that when I execute <code>git rebase master</code> on the deploy branch it is coming up with a 3-way merge/manual merge required error (I don't think the error message is really generic enough to post). Git tells me to perform a merge then use <code>git rebase --continue</code> to finish - which never works.</p> <p>What I have found 'does' work is running <code>git rebase master --interactive</code>, cleaning up the pick list (there is 5 or so repeated 'commits' but with different reference numbers (same message) in this list, so I'll choose one of them) and then manually do the merge. Once I have done this for each commit then I can continue the rebase and its all happy...</p> <p>Until next time I need to perform a rebase.</p> <p>So does anyone know what might be happy? The project isn't really 'secret' so if need be I can post messages, logs, branch graphs etc.</p> <p>Thanks </p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USMatthew Savage
    plurals
    1. PL
      singulars
      1. LTLinked
    2. 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 rebase continually fails and requires manual merge intervention
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit rebase continually fails and requires manual merge intervention
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POGit rebase continually fails and requires manual merge intervention
      1. This table or related slice is empty.
      1. VTUpMod
    1. COHow many commits do you have on your deploy branch, and can they be squashed? rebase has to preserve all the intermediate commits in a list of commits and it sounds like some of these now cause artifical conflicts as they are attempting to preserve an artificial intermediate state that doesn't really make sense any more.
      singulars
      1. POGit rebase continually fails and requires manual merge intervention
      1. USCB Bailey
 

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