Databases
StackOverflow2013
Postsdbo
PORoutinely sync a branch to master using git rebase
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PORoutinely sync a branch to master using git rebase
    primarykey
    data
    text
    <p>I have a Git repository with a branch that hardly ever changes (nobody else is contributing to it). It is basically the master branch with some code and files stripped out. Having this branch around makes it easy for me to package up a leaner version of my project without having to strip out the code and files manually every time.</p> <p>I have been using <code>git rebase</code> to keep this branch up to date with the master but I always get this warning when I try to push the branch after rebasing:</p> <pre><code>To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. </code></pre> <p>I then use <code>git push --force</code> and it works but I feel like this is probably bad practice. I want to keep this branch "in sync" with the master quickly and easily. Is there a better way of handling this task? </p> <h3>Update</h3> <p>See this topic for a full explanation and solution:</p> <p><a href="https://stackoverflow.com/questions/559917/git-rebase-and-git-push-non-fast-forward-why-use">git rebase and git push: non-fast forward, why use?</a></p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USm1755
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. PORoutinely sync a branch to master using git rebase
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PORoutinely sync a branch to master using git rebase
      1. USajmalafif
      1. VTFavorite
    3. VO
      singulars
      1. PORoutinely sync a branch to master using git rebase
      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