Note that there are some explanatory texts on larger screens.

plurals
  1. POMerge two repositories (original project and changed project WITHOUT HISTORY)
    primarykey
    data
    text
    <p>I have two repositories:</p> <ul> <li>Gephi (big open source project) hosted on github</li> <li>Project of my company based on gephi</li> </ul> <p>7 months ago, when our project started, somebody took a snapshot of gephi project on github and save it to corporate svn => change history loss</p> <p>now i decided to move our project to git repository and merge changes with original project</p> <p>i have now git repository migrated from svn with git-svn</p> <p>my files does not have change history beyond the time when our project started</p> <p>Can i map initial state of our repository to state of original repository? In other words i would like to start aplying our changes to original repository from specific revision.</p> <p><strong>Update:</strong></p> <p>Today i found another obstacle. Schema first:</p> <p><img src="https://i.stack.imgur.com/KuFvm.png" alt="enter image description here"></p> <ul> <li><p>red branch is the original project</p></li> <li><p><code>&lt;alpha1&gt;</code> and <code>&lt;alpha2&gt;</code> are commits of plugins for main project (unrelated to code commited in <code>&lt;E' E'' E'''&gt;</code>)</p></li> <li><p>in <code>&lt;E'&gt; &lt;E''&gt; &lt;E'''&gt;</code> was added code from main project (red) repository <code>&lt;E&gt;</code> (in each commit cca one third of project from <code>&lt;E&gt;</code>)</p></li> </ul> <p>I have fetched red and blue repositories into one. On second schema i have desired state. Is it possible to do this? (for example make from <code>&lt;E' E'' E''&gt;</code> just one commit (<code>&lt;E'&gt;</code>) and then mark that commit as a merged from branches <code>&lt;ABCD&gt;</code> and <code>&lt;alpha1 alpha2&gt;</code>)</p> <p>Thank you Julien for your response. It seems very helpful.</p>
    singulars
    1. This table or related slice is empty.
    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. This table or related slice is empty.
 

Querying!

 
Guidance

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