[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: literate programming, development log -- ideas? (ominbus reply)

From: Maxim Nikulin
Subject: Re: literate programming, development log -- ideas? (ominbus reply)
Date: Wed, 9 Jun 2021 21:52:49 +0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1

On 09/06/2021 00:21, Samuel Banya wrote:

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.

Likely you are writing about merge conflicts. They are not weird, it is just necessary to resolve them manually and commit clean variant. There is no general way to guess what particular user mean when some file in different branches has been modified at the same places. See e.g.

I remember one case when *clean* merge resulted in JS file that was syntactically correct but actually had broken code. It is extremely rare accident.

On Tue, Jun 8, 2021, at 1:15 PM, Greg Minshall wrote:
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 ...)

There is "git log -Gpattern" option that allows to search for code changes. Do not confuse it with "--grep" that is for commit messages. "git gui blame file" can show file state before some line was changed. Probably magit has a similar command.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]