Yes it does. That commit is just prior to commencing work on the laptop. What Huu said about using git clone instead of git init/pull on the laptop sounds like it could have caused the issue. I will need to reset to the last commit on the laptop.
Thanks On Saturday, 7 December 2013 19:52:25 UTC+11, Peter J Weisberg wrote: > > On Dec 6, 2013 7:32 PM, "Phillip Tutt" <phil...@gmail.com <javascript:>> > wrote: > > > > This is the bit that doesn't make sense: > > > > 1. Remote last log entry: > > 2013-11-04 > > Phil > > ticketing and questions working > > admintemplate > > 4a09c3 > > > > 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 <x...@gmail.com <javascript:>> > > Date: Thu Dec 5 22:07:41 2013 +1100 > > > > fixed merge conflicts > > > > commit 4a09c3c9093b53989e4fff5cc392299364315402 > > Author: Phil <x...@gmail.com <javascript:>> > > Date: Mon Nov 4 16:33:57 2013 +0800 > > > > ticketing and questions working > > What commit is 53a9da3? Is it in any of your logs? > -- 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 to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
