On Wednesday, July 26, 2017 at 8:44:13 PM UTC+2, JNickVA wrote:
> 3. and 4. I don't even have enough information to know the state of the
> master when each of the 2 branches were created
What do you mean here? Isn`t Git history showing you the exact state of
"master" when each of the branches was branched off...?
I guess we are talking about branches inside the same repository, and not
more unrelated ones? If so, you should be able to get all the info you need
from Git itself.
Still, depending on how the commits were made (and how informatively their
messages are written), it will still be a little hassle -- or a lot of pain
-- to resolve conflicts inside changes made by other people... :( On the
positive side, merging some ~40 commits of difference shouldn`t be that
bad... hopefully :)
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.