Re: [git-users] Re: Merging from pull

2013-12-07 Thread PJ Weisberg
On Dec 6, 2013 7:32 PM, Phillip Tutt phil.t...@gmail.com 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

Re: [git-users] Re: Merging from pull

2013-12-07 Thread Phillip Tutt
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

Re: [git-users] Re: Merging from pull

2013-12-07 Thread PJ Weisberg
On Dec 7, 2013 11:32 AM, Phillip Tutt phil.t...@gmail.com wrote: 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