Fwd: Best practices for updating old repos

(Sorry I sent this originally last night in gmail but not in plain text mode and it bounced) Hi Michael, In git if you don't merge often then you get these merge conflict hell situations. In my experience the main conflicts come not from the unified diff of those 130 commits but from

Re: Best practices for updating old repos

On 06/15/2017 09:22 PM, Stefan Beller wrote: On Thu, Jun 15, 2017 at 5:52 PM, Michael Eager wrote: One other variant of the rebase approach I've thought of is to do this incrementally, rebasing the old repo against an upstream commit a short time after the old repo was

Re: Best practices for updating old repos

Thanks for your comments. On 06/15/2017 07:57 PM, Michael O'Cleirigh wrote: Hi Michael, In git if you don't merge often then you get these merge conflict hell situations. In my experience the main conflicts come not from the unified diff of those 130 commits but from differences in the

Re: Best practices for updating old repos

On Thu, Jun 15, 2017 at 5:52 PM, Michael Eager wrote: > One other variant of the rebase approach I've thought of is to do > this incrementally, rebasing the old repo against an upstream commit > a short time after the old repo was forked, fixing any conflicts, > rebuilding and

Best practices for updating old repos

Hi All -- I'm working with code that is based on a five year old repository. There are 130 local commits since the repo was forked. Naturally, the upstream project has moved on significantly. I'm wondering about best approaches to updating the repo to the current upstream version. Here are