[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gits] importing code from other sources
Leigh> I have some code that I imported from a foreign source and
Leigh> modified to work locally.
Leigh>
Leigh> Now I want to update from a more modern version of the imported
Leigh> code, applying our local changes into that.
Leigh>
Leigh> Is there a reasonable why to do this in git?
Assuming that the remote side isn't just a git repo, I would
+ create a "vendor" branch
+ import snapshots from the vendor onto that branch
+ do local work on the master branch
+ as needed, "git checkout master && git merge vendor"
The A3 "unfs" repository is set up in this style.
Eric.
--
-------------------------------------------------------------------------------
Eric Eide <eeide at cs.utah.edu> . University of Utah School of Computing
http://www.cs.utah.edu/~eeide/ . +1 (801) 585-5512 voice, +1 (801) 581-5843 FAX