emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Maxim Nikulin <manikulin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: literate programming, development log -- ideas? (ominbus reply)
Date: Wed, 9 Jun 2021 21:52:49 +0700	[thread overview]
Message-ID: <s9qkk2$96l$1@ciao.gmane.io> (raw)
In-Reply-To: <da7024b2-2d35-4176-89ec-7421730fbbca@www.fastmail.com>

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.
https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts

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.



  parent reply	other threads:[~2021-06-09 14:53 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-07 11:43 literate programming, development log -- ideas? Greg Minshall
2021-06-07 12:00 ` Juan Manuel Macías
2021-06-08 17:15   ` literate programming, development log -- ideas? (ominbus reply) Greg Minshall
2021-06-08 17:21     ` Samuel Banya
2021-06-09  8:59       ` Eric S Fraga
2021-06-09 22:21         ` Dr. Arne Babenhauserheide
2021-06-10 22:07           ` Samuel Wales
2021-06-11  0:13             ` Samuel Banya
2021-06-11 14:30               ` Juan Manuel Macías
2021-06-11 15:02                 ` Samuel Banya
2021-06-09 14:52       ` Maxim Nikulin [this message]
2021-06-10 13:28         ` Greg Minshall
2021-06-11 19:51       ` Christian Barthel
2021-06-13  0:46       ` Tim Cross
2021-06-13 15:48         ` Samuel Banya
2021-06-13 23:13           ` Tim Cross
2021-06-09  8:57     ` Eric S Fraga
2021-06-13  0:31       ` Tim Cross
2021-06-13  4:27         ` Greg Minshall
2021-06-13  7:29           ` Tim Cross
2021-06-14  6:14             ` Greg Minshall
2021-06-07 12:08 ` literate programming, development log -- ideas? Eric S Fraga
2021-06-13  0:24   ` Tim Cross
2021-06-13 15:44     ` Samuel Banya
2021-06-14 12:57       ` Greg Minshall
2021-06-07 13:53 ` Dr. Arne Babenhauserheide
2021-06-07 17:59   ` briangpowell
2021-06-07 23:17     ` Dr. Arne Babenhauserheide
2021-06-08  2:06       ` Samuel Banya
2021-06-08  3:23         ` Greg Minshall
2021-06-08  3:31           ` Samuel Banya
2021-06-08  6:15             ` Greg Minshall
2021-06-08 16:59     ` Greg Minshall
2021-06-07 19:19 ` Jack Kamm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='s9qkk2$96l$1@ciao.gmane.io' \
    --to=manikulin@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).