Re: Git methodology question
- From
Avery Pennarun <apenwarr@gmail.com>
- Date
- May 14, 2010, 21:54 UTC
- Message-ID
- <AANLkTin40FdBUx75c0ENHU6PhsN3tPjy1dK-D6cxPgPX@mail.gmail.com>
- In-Reply-To
- <F802F7F4D3C2674881AB105A9CD324A804EE0D0D8D@azsmsx504.amr.corp.intel.com>
On Fri, May 14, 2010 at 12:14 PM, Akhbari, Farshad <farshad.akhbari@intel.com> wrote:
Show 11 quoted lines
> In order of time: > User1 – pulls from the origin; updates, modifies, verifies and commits into his clone. This will generate SHA1_1 > User2 – pulls from the origin; updates, modifies, verifies and commits into his clone. This will generate SHA1_2 > User3 – pulls from the origin; updates, modifies, verifies and commits into his clone. This will generate SHA1_3 > > In none of these cases, anyone is updating from each other’s clones > > At the end of the week, the model builder needs to merge and verify all commits from user1, user2 and user3 before pushing into the origin master. > > The question is, > Can the model builder use SHA1_3 tag only to get all the updates made by user1, user2 and user3; or all SHA1 tags are needed?
You will definitely need all three commit ids (SHA1_* in your words) since all three commits are totally independent from each other.
In order for someone to *get* all three of those commits, they will have to retrieve them somehow. Generally, you do it in one of these ways:
1) Run a git-daemon (or similar) on all three users' machines, and let the model builder 'git pull' from all three servers
or
2) Have all three users 'git push' to a different branch on the central repo, as in "git push origin HEAD:user1", "git push origin HEAD:user2" and so on, and have the model builder merge all three branches and then push the result back to master.
Of course, you could also have everybody pulling from / pushing to master directly, but I guess that isn't what you're trying to accomplish (it sounds like you want your "model builder" to be a central maintainer who decides what does/doesn't get into the main trunk).
Have fun,
Avery