This is the bit that doesn't make sense:

1. Remote last log entry: 2013-11-04Philticketing and questions 
2. Desktop last log entries, note, the last commit was after I had to fix 
the merge conflicts and then I committed.  But looking at the log there 
shouldn't need a merge, since the latest commit the Remote and Desktop 
should just be "ticketing and questions working":
$ git log
commit b1a68b9de0c5097810ffd6c4eb9f006e4a090616
Merge: 53a9da3 4a09c3c
Author: Phil <>
Date:   Thu Dec 5 22:07:41 2013 +1100

    fixed merge conflicts

commit 4a09c3c9093b53989e4fff5cc392299364315402
Author: Phil <>
Date:   Mon Nov 4 16:33:57 2013 +0800

    ticketing and questions working

On Saturday, 7 December 2013 02:12:39 UTC+11, Huu Da Tran wrote:
> 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 them.

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

Reply via email to