[ciphershed] Re: Git logistics

  • From: Stephen R Guglielmo <srguglielmo@xxxxxxxxx>
  • To: ciphershed@xxxxxxxxxxxxx
  • Date: Mon, 23 Jun 2014 09:38:25 -0400

On Fri, Jun 20, 2014 at 12:13 PM, Jason Pyeron <jpyeron@xxxxxxxx> wrote:
> I am trying to get a straw poll out there on how many people have started
> hacking against any of the commits in the git repo?
> If you have any pending edits can you say which commit its against?
> It is looking like importing the history and linking it is a little hacky, 
> and I
> am strongly opposed to rebooting the repository.
> By hacky, it requires a double merge, but if anyone else is branching or 
> working
> off of a commit prior to the double merge, the history gets lost. To proceed
> each uncommited change set will have to be stashed and then pulled to work of
> the latest.
> -Jason

My fork is against the current version published in GitHub, a03e565.I
plan on adding an upstream remote and keeping my fork synced with the

I'm not sure what you mean about the double merge? No history should be lost?

Other related posts: