Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Suppose we have two people in a group. We maintain two GIT trees A and B, I work on A and the other guy works on B.
I created file a on March 1st, file c on March 3rd in A.
a – March 1st
c – March 3rd
And the other guy created file b on March 2nd in B.
b – March 2nd
Is it possible to merge two trees so I have a new tree which looks like:
a – March 1st
b – March 2nd
c – March 3rd
and when I checkout files for March 2nd, I will get file a and b?
Thanks!
I wrote a script to check-in every commit one by one. It is stupid but I guess that is an easy way and probably the only way I know to do it.