Not sure if it counts as off-topic for this thread, but does everyone use Git to manage their Org docs and notes?

I ask because of Greg's previous post.

I've noticed that some times after git merge events across a few machines (ex: I forgot I had already pushed notes for my private notes on one machine, and had to merge the results from another machine), I'll get weird "HEAD" and "END" statements inserted by Git.

Also, combined with some tasks duplicating as a result was annoying.

Was debating if this is just something I'd have to deal with, or if there might be a better versioning workflow (ex: just using rsync, etc)

Would be curious on everyone's thoughts.

~ Sam

On Tue, Jun 8, 2021, at 1:15 PM, Greg Minshall wrote:
> Juan Manuel, Eric, Jack, Arne,
> 
> thank you all very much for your thoughts.
> 
> i've sort of come to grips with Jack's + Arne's, solution, and defined a
> "capture template" that adds something to a pre-named headline.  (note
> and capture are among the org features of which i have maintained to
> date a studied ignorance; alas, or a-luck, no more.)
> 
> i realized i would like to have headlines (mostly to have the
> convenience of =consult-org-heading=), which i think rules out putting
> my logs inside property drawers.
> 
> Eric, when you use something RCS-like as your version control system, i
> assume that makes grepping to find some old note easy enough.  but,
> these days i tend to use git.  when (assuming) you use git, do you have
> some easy way to say "well, i had this code that looked sort of like
> this... where was it?"?  (sorry, that's really a git question, but ...)
> 
> cheers, Greg
> 
> ps -- for completeness, or code review...
> ----
> ("l"
> "add a logbook entry"
> entry
> (file+olp+datetree buffer-file-name "Logbook")
> "* lbe: %?logbook entry\n  :PROPERTIES:\n    creation-date: %t\n
>   :END:"
> :empty-lines 1
> :tree-type month)  
> ----
> 
>