*   b1a68b9 fixed merge conflicts
|\
| * 4a09c3c ticketing and questions working
| * 49a3113 questions progress1
| * 414b5d2 ticketing fixes - editing works
| * b39c2d1 added ticketing
| * 6decbb7 general ui fixex
| * 88176fc fixed model
| * 487ecd7 fixed references and updated to EF6
* | 53a9da3 ckeditor changes
|/
* c4c0e09 fixed ckeditor formatting
* 1747b84 ckeditor, contenteditable false???
* 1f1540b edit event formatting

On Sunday, 8 December 2013 07:41:59 UTC+11, Peter J Weisberg wrote:
>
>
> On Dec 7, 2013 11:32 AM, "Phillip Tutt" <phil...@gmail.com <javascript:>> 
> 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 commit on the laptop.
>
> So it's the parent of 4a09c3c?  That's the first commit in the laptop log 
> you showed us, but something doesn't add up.   Git wouldn't make you do a 
> merge between a commit and its own parent.
>
> What does the output of "git log --graph --oneline" look like?
>

-- 
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.

Reply via email to