On Thursday, December 5, 2013 7:08:14 AM UTC-5, Phillip Tutt wrote:
> What I would expect is the code now on the desktop would be the same as
> what was on the laptop...however, I found that some kind of merge was
> happening and conflicts, but shouldn't it just be a fast forward?
Note, I did not make any changes on the desktop from the time I pushed to
> the remote to the time I pulled back down, but even if I did, I would
> expect the merge to work, but I don't have much faith in it at the moment
> due to my limited experience.
Try to display your "git log" for both your Desktop and Laptop and compare
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/groups/opt_out.