On Thu, 30 Apr 2015 10:01:04 -0500 "Edward K. Ream" <[email protected]> wrote:
> 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? So the conflict would have been marked up like: { <<<<<<<<<<<< HEAD "asctime": "Thu Apr 30 06:52:34 CDT 2015", "timestamp": "20150430065234" ============ "asctime": "Thu Apr 30 06:52:34 CDT 2015", "timestamp": "20150430065234" >>>>>>>>>>>> 838fd2a45 } or something. In the general case of handling a merge conflict you should edit the file manually and select pieces, then use `git add <filename>` to indicate the working copy is the copy with resolved conflicts. Or using meld, `git mergetool` (http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html) In the case of commit_timestamp.json, where it really doesn't matter that much, you can just do git checkout --theirs leo/core/commit_timestamp.json (https://rtcamp.com/tutorials/git/git-resolve-merge-conflicts/) Cheers -Terry -- 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.
