We've discussed this at length in other threads. I seem to recall that Terry said that there was a clever fix for this. Something better than `git checkout --ours leo/core/commit_timestamp.json`. But maybe I'm mis-remembering.
Now that I'm using branches, I suspect the way to merge the master *into *a branch is to use --theirs, not --ours: git checkout my_branch git merge git checkout --theirs leo/core/commit_timestamp.json git commit -m "resolved conflicts in .json file" git checkout master git merge my_branch # nothing should happen, by definition. I've just merged both the color and and demo branches into master with this work flow. Only the merge from master into the demo branch caused a conflict in the .json file. Does all this make sense to everyone? Edward -- 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 https://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
