How does git come up with the result (middle) in t...
# randomu
ursus
02/06/2021, 12:40 AMHow does git come up with the result (middle) in three way diff?.
Its hard to see for some reason -- left side says 1.3.1, right side says 1.4, and result (middle) says 1.3 .. how?
r
Ruckus
02/06/2021, 1:23 AMIs saying the value is currently (as of the last common commit) 1.3, but the remote has since changed it to 1.3.1, and you've locally since changed it to 1.4.
Ruckus
02/06/2021, 1:25 AM(I may have local and remote backwards. I'm not at a computer to check which is which.)
u
ursus
02/06/2021, 1:45 AMhm, but I was at the latest commit, so local == remote in this case; so unsure how does git remember the 1.3 still
5 Views