Databases
StackOverflow2013
Postsdbo
POGit merge squash repeatedly
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit merge squash repeatedly
    primarykey
    data
    text
    <p>I'm trying to have two branches with binary files in git - one "development" and one "stable". The development branch can have several changes of these files before I want to "release" them to the stable branch (and the stable branch has those files renamed, in case that's relevant).</p> <p>I could do a normal merge, this works fine, but preserves too much history - when pulling the "stable" branch, all intermediate commits from the "development" branch are pulled as well (because they're parent commits). But we're talking about binary files that don't have any sensible merging strategy (except theirs/ours), so the actual history of the files on the development branch is useless. When I pull the "stable" branch, I get this:</p> <pre> X-------------------G stable / / a---b---c---d---e---f---g development </pre> <p>Because G has a parent in the development branch, I get the whole history of the development branch (data objects for c, d, e, f and g) in my repository, which I'm not interested in (X is the same as b, with some file renaming applied).</p> <p>So I tried to <code>git merge --squash</code> changes from the development branch to the stable branch. The first such merge and commit went OK, the results were as expected (nice change log in the commit message, no relation to the development branch):</p> <pre> X-------------------G stable / a---b---c---d---e---f---g development</pre> <p>After I pull this squashed stable branch, I get this in my repository, which is what I want:</p> <pre> a---b---X---G </pre> <p>But the second merge failed (because git had no way to know how much I merged already and got confused).</p> <ul> <li>Is it possible to somehow record the merge, without producing a "merge commit" with two parents?</li> <li>Or, is it possible to tell git to merge only a certain "range" of revisions, like in SVN?</li> <li>Or, is it possible to do a normal merge without having to download all refs from the other branch when pulling?</li> <li>Or should I provide a custom merge driver for the files in question, that simply renames "their" version to "our", thereby resolving the conflicts? I'm still afraid that <code>--squash</code> will always try to merge the whole history, up to the common parent, solving only half of my problem.</li> </ul> <p><b>Update: rebasing</b></p> <p>If I understand rebasing correctly, I'll end up with this:</p> <pre> X stable / a---b---c---d---e---f---g development </pre> <p>Which gets me all the data I'm not interested in (c, d, e, f) and as a bonus, I'll loose the information that b was a stable version in the branch.</p> <p>Each development revision adds about 5MB to the repository size (and repacking the whole repo shrinks it only about 10%), the "stable" branch comes almost for free (the data is already there). I want pulling a single new revision from the stable branch to pull only the new 5MB, but instead updating from X to G downloads 25MB, because I'm somehow not able to say that I don't care about the contents of c, d, e and f.</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USKen Williams
    1. USKim Sullivan
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    3. PL
      singulars
      1. LTLinked
    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 merge squash repeatedly
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit merge squash repeatedly
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POGit merge squash repeatedly
      1. USJCotton
      1. VTFavorite
    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