On Wed, Apr 29, 2015 at 11:24 AM, Kent Tenney <[email protected]> wrote:
> Well done. > 1/2 hour, shows when and how to use some scarier git commands > https://www.youtube.com/watch?v=4EOZvow1mk4 > A great video. I think git reset --hard would have been a good idea after mistakenly discarding Terry's commit. I could have re-committed my work, pulled Terry's work and all would have been well. A related question. This all came about because I wanted to discard one of the conflicting .json files. What is the best way to resolve the conflict? EKR -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
