From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0BWgORApxmBWFAEAgWs5BA (envelope-from ) for ; Sun, 13 Jun 2021 17:49:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iD6gNBApxmD4KAAAbx9fmQ (envelope-from ) for ; Sun, 13 Jun 2021 15:49:36 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0CE7814272 for ; Sun, 13 Jun 2021 17:49:36 +0200 (CEST) Received: from localhost ([::1]:46052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsSMg-0007ag-TM for larch@yhetil.org; Sun, 13 Jun 2021 11:49:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsSMK-0007aH-3Y for emacs-orgmode@gnu.org; Sun, 13 Jun 2021 11:49:12 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsSMI-0004xV-5p for emacs-orgmode@gnu.org; Sun, 13 Jun 2021 11:49:11 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id BDCE55C0197 for ; Sun, 13 Jun 2021 11:49:09 -0400 (EDT) Received: from imap10 ([10.202.2.60]) by compute4.internal (MEProxy); Sun, 13 Jun 2021 11:49:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= mime-version:message-id:in-reply-to:references:date:from:to :subject:content-type; s=fm3; bh=YmU2cu7uHxBwnSvAO7TAx2UqRtQA9Ur J+AVWB0NfLW4=; b=RN1ujgl7MEDk3k/sP1++gklLTbS3qB1CqYNuitugPFScPKX 6v3tdeAtBrHrsBM3qSgDzKr6nu5MWDnOlSpKW+mQ+NDXmcX6tYRg6ZZdHKUEMpqH xYwnbrnH+zRhRqkms9vlJruojzu/Zhonq/m+z7OvWQ+fNEQiCJ7lHQ/ouJM/xKkS YFeyA2G7pJWmNq+S9LmcS5tWqoW7UzEoUzUiqJf8qNSoahZ6f3zWYu3PBc6cuQrs UUFrs+WouZCOH1ZZqGW2XijSvdYoYXxeoOIelxZfqS7HAVBA4WDjKjMUmtvnEq/B h2DGAuFIkrYKwpO8LypE9sIUbyzoXMktTvjcjVQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=YmU2cu 7uHxBwnSvAO7TAx2UqRtQA9UrJ+AVWB0NfLW4=; b=I28x6V+w12f5eSHqqVapCI D9H1DblI7/5qrH3i84VdvvphvJETkV9hAbIA8oZrHKy+ji8HAdYQ9guJV63x6FuY 9ya6ld/sTvZotLq+5jZySCIpADXXNIkDKFx69thqz5u0Q8dOQtNF7OZILJtbvAOw 3Poxav13DfIDBAXgM6ZNu67TplEXR9gZMGXilPw3swtWaC3njyk7sfbiV+9vyLG0 LzMCkaAEi0jgTzbz484xpHTyfFdqKe8BAi7BKEaXhZoJfIFe7JiqrG3LoMhMfmzW AaFT0wW4+JX64PkvZ11Wh1u96YAQVlVRvkzjijpSW1wWeZNJUIAWYsx+lZobyEEg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfedvfedgleejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtsegrtd erreerredtnecuhfhrohhmpedfufgrmhhuvghluceurghnhigrfdcuoehssggrnhihrges fhgrshhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpedvudefgefhueeiiedtff fhgfehhffgleelfffhtdffuedtffetieevtddvjeeiieenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehssggrnhihrgesfhgrshhtmhgrihhlrd gtohhm X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 95DAA4E00B8; Sun, 13 Jun 2021 11:49:09 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.5.0-alpha0-519-g27a961944e-fm-20210531.001-g27a96194 Mime-Version: 1.0 Message-Id: <6271e100-9799-435a-992b-e657849c3302@www.fastmail.com> In-Reply-To: <87o8cafuex.fsf@gmail.com> References: <643664.1623172504@apollo2.minshall.org> <87o8cafuex.fsf@gmail.com> Date: Sun, 13 Jun 2021 15:48:48 +0000 From: "Samuel Banya" To: "Charles Berry" Subject: Re: literate programming, development log -- ideas? (ominbus reply) Content-Type: multipart/alternative; boundary=dadb333766454305a0e9d129276e34d7 Received-SPF: pass client-ip=66.111.4.26; envelope-from=sbanya@fastmail.com; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623599376; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=YmU2cu7uHxBwnSvAO7TAx2UqRtQA9UrJ+AVWB0NfLW4=; b=YhYKHgrcOlWT50Li/0Mj0M3CLH1igoVNMXH0OK+/eCsHPyvUrK8pkfwculEey3Ib8E2lEN VcuBkIg8zDsmdjJmh2jckp4g7c/tHelkdMpbExThM00EcVwHqkeca2lTX5/wpQCxSXQtNq IYMN9K4ZoA7qy2WNkATq/oi2cAQxU7U5yQ/m7Kl98OsK/vzk+te4yzh6V26nduCt6Volr+ JAXnifM43Kp+sjcNQamdQkfIc5L49oAyeUV1Rv/roA6ikyoh/q0Mb3CUAIQdI5baAnPxdQ kHwbuaSH6VaFNVM4AJu3mu71N22lWe3z8yN258gF/OOG1JsKKGfMK3uQvuJnjA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623599376; a=rsa-sha256; cv=none; b=g3qjCcEa97Zxm3sODxJxAVuiTlgHr3uhYNIAtCrHaNhnlfendJ9b2EFRNXuMvznQ8U9yXL ucZOChmt+nvAe/DpZzpEtQMzL/+iRsEzda/i13CbeWkjU2K50I3DJufDg6pvHlHrq46g2r DxSy5LycJyufn116XHDXNdxAXamy4mkYRfNa70MjpwUYUa8ajPCSG/LQ+KknPffvDqFN2e OvL7xOj+ePwnzcp4Nf9LaCTXjSqo6+0f9uEg0axPq27hXg4HZXkonpe2iwywygwI2nbvZD ac48L0mcyO8rxyoNRCRIOmVclMqR8cHf83I2Ln8EwRfzC6AmIJDB08aCqe+PRQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=fastmail.com header.s=fm3 header.b=RN1ujgl7; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=I28x6V+w; dmarc=pass (policy=none) header.from=fastmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -2.11 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=fastmail.com header.s=fm3 header.b=RN1ujgl7; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=I28x6V+w; dmarc=pass (policy=none) header.from=fastmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 0CE7814272 X-Spam-Score: -2.11 X-Migadu-Scanner: scn0.migadu.com X-TUID: 5/eHHBP1St8k --dadb333766454305a0e9d129276e34d7 Content-Type: text/plain Hey Tim, Wow that's an awesome idea too aka to create local branches on each machine, and then switch over the master branch to pull them in. Do you have any video references for this kind of thing? I like videos first, and then documentation. It would really help me out since I'd love to try to figure this kind of thing out, since I am pretty close to just using rsync for my Git notes going forward, but needed that kind of convincing otherwise. On Sun, Jun 13, 2021, at 12:46 AM, Tim Cross wrote: > > "Samuel Banya" > writes: > > > 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 > > > > I use git as the master and then checkout to whatever machine I'm working > on. I tend to have at least 3 different machines I'm working on (home > Linux, work Linux and Macbook). > > On each machine, I will checkout from master and then create a 'local' > branch where I make any local changes. When I'm finished working > locally, I will commit to the local branch, switch to the master branch, > do a pull. If no changes are pulled, then I will merge in the local > branch and push up to the master repository. If changes are pulled, then > I will make a decision whether to use rebase to add those changes to my > local branch or just merge. Deciding on which depends on the types of > things changed, size of what has changed etc. > > I find rebasing and merging is often the best approach to keeping commit > logs fairly clean and linear. However, that will depend on what is being > changed and the amount of changes. Frequent pulling and either merging > and rebasing is useful. > > Creating new branches (both just locally and within the master > repository) is a very lightweight operation. I use lots of branches and > will regularly go back through and get rid of old branches when no > longer needed (i.e. changes in the branch have been merged into master > or the branch topic is no longer relevant/needed etc). Understanding the > difference between a rebase and a fast-forward merge is important. > Likewise, using branches effectively is critical. My master branch tends > to be quite clean - I almost never make changes directly in the master > branch. Everything happens in another branch and later merged into the > master when ready. > > --dadb333766454305a0e9d129276e34d7 Content-Type: text/html Content-Transfer-Encoding: quoted-printable
Hey Tim,

Wow that's an awesome idea too aka to create loca= l branches on each machine, and then switch over the master branch to pu= ll them in.

Do you have any video reference= s for this kind of thing?

I like videos fir= st, and then documentation.

It would really= help me out since I'd love to try to figure this kind of thing out, sin= ce I am pretty close to just using rsync for my Git notes going forward,= but needed that kind of convincing otherwise.

<= div>On Sun, Jun 13, 2021, at 12:46 AM, Tim Cross wrote:

"Samuel Bany= a" <sbanya@fastmail.com&= gt; writes:

> Not sure if it counts as o= ff-topic for this thread, but does everyone use Git to manage their Org = docs and notes?
>
> I ask because of G= reg's previous post.
>
> I've noticed = that some times after git merge events across a few machines (ex: I forg= ot I had already pushed notes for my private notes on one machine,
> and had to merge the results from another machine), I'll g= et weird "HEAD" and "END" statements inserted by Git.
>=
> Also, combined with some tasks duplicating as a resu= lt was annoying.
>
> Was debating if t= his is just something I'd have to deal with, or if there might be a bett= er versioning workflow (ex: just using rsync, etc)
>
> Would be curious on everyone's thoughts.
= >
> ~ Sam
>

I use git as the master and then checkout to whatever machine I'm = working
on. I tend to have at least 3 different machines I= 'm working on (home
Linux, work Linux and Macbook).

On each machine, I will checkout from master and = then create a 'local'
branch where I make any local change= s. When I'm finished working
locally, I will commit to the= local branch, switch to the master branch,
do a pull. If = no changes are pulled, then I will merge in the local
bran= ch and push up to the master repository. If changes are pulled, then
=
I will make a decision whether to use rebase to add those cha= nges to my
local branch or just merge. Deciding on which d= epends on the types of
things changed, size of what has ch= anged etc.

I find rebasing and merging is o= ften the best approach to keeping commit
logs fairly clean= and linear. However, that will depend on what is being
ch= anged and the amount of changes. Frequent pulling and either merging
=
and rebasing is useful.

Creating= new branches (both just locally and within the master
rep= ository) is a very lightweight operation. I use lots of branches and
=
will regularly go back through and get rid of old branches wh= en no
longer needed (i.e. changes in the branch have been = merged into master
or the branch topic is no longer releva= nt/needed etc). Understanding the
difference between a reb= ase and a fast-forward merge is important.
Likewise, using= branches effectively is critical. My master branch tends
= to be quite clean - I almost never make changes directly in the master
branch. Everything happens in another branch and later merg= ed into the
master when ready. 



--dadb333766454305a0e9d129276e34d7--