The best way, although I think it requires action per clone of the repo., is to
add
commit_timestamp.json merge=ours
in the .gitattributes file in the to level folder of the repo. (where .git
lives, but not in .git).
This just makes git use "ours" whenever there's a conflict. It doesn't really
matter which one it chooses.
[insert long pause for fresh clone of leo-editor]
So it doesn't require per clone action, because .gitattributes is part of the
repo. So if it's not currently working (i.e. commit_timestamp.json merge=ours
is in your .gitattributes file but you're still getting conflicts, maybe the
path's wrong, i.e. it should be leo/core/commit_timestamp.json merge=ours
perhaps.
Cheers -Terry
From: Edward K. Ream <[email protected]>
To: leo-editor <[email protected]>
Sent: Tuesday, January 31, 2017 7:25 AM
Subject: Is there a way to avoid conflicts with commit_timestamp.json?
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.
--
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.
