Hi all,

I'm having trouble with the git process.

We got a origin/master where only i can write to. I got programmers pulling 
from that, and pushing to their own repo where I can pull the changes, 
merge and push to origin.

Is there a way for me to know when they actually pushed to their repos?

My problem is the following timeline:

 - Time 1: everyone pull from origin/master.
 - TIme 2: programmer1 makes changes and commit to local repo.
 - Time 3: programmer1 push to p1repo.
 - Time 4: programmer1 makes changes and commit to local repo.
 - Time 5: I pull p1repo
 - Time 6: programmer1 push to p1repo.
 - Time 7: I makes changes and push to origin/master
 - Time 7...50: I don't need anything from programmer1.
 - Time 51: programmer1 makes changes and commit to local repo.
 - Time 52: programmer1 push to p1repo.
 - Time 53: I pull p1repo.

Code changes at Time7, affects code change made at Time4.

How would you guy trace back this scenario.  When I use "git blame", i see 
that the programmer made the changes before me (time4 vs time7), but that 
change was not available at time5 when i pulled.

Thanks.

-- 


Reply via email to