Databases
StackOverflow2013
Postsdbo
POcan't push to branch after rebase
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POcan't push to branch after rebase
    primarykey
    data
    text
    <p>We use git and have a master branch and developer branches. I need to add a new feature and then rebase the commits to master, then push master to CI server.</p> <p>The problem is that if I have conflicts during rebase I cannot push to my remote developer branch (on Github) after the rebase is complete, until I pull my remote branch. This causes duplicate commits. When there are no conflicts, works as expected.</p> <p>question: after rebase and conflict resolution, how do I sync up my local and remote developer branches without creating duplicate commits</p> <p>Setup:</p> <pre><code>// master branch is the main branch git checkout master git checkout -b myNewFeature // I will work on this at work and at home git push origin myNewFeature // work work work on myNewFeature // master branch has been updated and will conflict with myNewFeature git pull --rebase origin master // we have conflicts // solve conflict git rebase --continue //repeat until rebase is complete git push origin myNewFeature //ERROR error: failed to push some refs to 'git@github.com:ariklevy/dropLocker.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. // do what git says and pull git pull origin myNewFeature git push origin myNewFeature // Now I have duplicate commits on the remote branch myNewFeature </code></pre> <h2>EDIT</h2> <p><strong>So it sounds like this will break the workflow:</strong></p> <p>developer1 working on myNewFeature developer2 working on hisNewFeature both use master as main branch</p> <p>developer2 merges myNewFeature into hisNewFeature</p> <p>developer1 rebases, resolves conflicts, then force pushes to remote branch for myNewFeature</p> <p>a couple days later, developer2, merges myNewFeature into hisNewFeature again</p> <p>Will this cause the other developers to hate developer1?</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USMatt
    1. USMatt
    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
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POcan't push to branch after rebase
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POcan't push to branch after rebase
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POcan't push to branch after rebase
      1. This table or related slice is empty.
      1. VTUpMod
    1. COnot a solution but just a thought. who's `we`? are you on a team of more than just you? `they` say (the people who know more than I do) that if you share your code than you should not be using `rebase`. Why aren't you just doing `git pull` and `git merge`?
      singulars
      1. POcan't push to branch after rebase
      1. USAdamT
    2. COsorry, We = development team
      singulars
      1. POcan't push to branch after rebase
      1. USMatt
    3. COso yeah, probably shouldn't be rebasing when you're sharing code. that may lead you to have to do things like what's listed below (`force` the push)
      singulars
      1. POcan't push to branch after rebase
      1. USAdamT
 

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