From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eG4fE31ZxWDhRAEAgWs5BA (envelope-from ) for ; Sun, 13 Jun 2021 03:03:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id wD+rDn1ZxWD5TwAAbx9fmQ (envelope-from ) for ; Sun, 13 Jun 2021 01:03:57 +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 B513923249 for ; Sun, 13 Jun 2021 03:03:56 +0200 (CEST) Received: from localhost ([::1]:48726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsEXa-0006jR-Mf for larch@yhetil.org; Sat, 12 Jun 2021 21:03:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsEWt-0006jE-V5 for emacs-orgmode@gnu.org; Sat, 12 Jun 2021 21:03:11 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:46746) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsEWp-0002Ca-Ve for emacs-orgmode@gnu.org; Sat, 12 Jun 2021 21:03:11 -0400 Received: by mail-pg1-x52f.google.com with SMTP id n12so5653781pgs.13 for ; Sat, 12 Jun 2021 18:03:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:subject:date:in-reply-to:message-id :mime-version; bh=bUgfLS93n3kknOgCf/rGlUYYh2ep0FyT/qlJf/H4v1c=; b=Z/4Bk9DG5GiuG56BfhhaTJMRjhx0yz/UnPLjy4+Ikj4En2fWRRZ/m0GJ8JQOnPhU4f jXT93ArbGnUzUqTnCoU7WaVEpl163G6g0diYBYCvdZF3wSOaFFU/ZsURIHQpBuVRmbzJ n7e1cHD27wAY3LLy0U0Et0C4HcGpKuOP/3qbNn8cpEFtRVdfpOkS4x+PS4/f3F4bxjhH 9vF0yKLOlpcJRbgLi3uhz2ZRKKXucqEO84X61prp4Jsfk3BNBExBiSurGpYadM/+pOrU yiDU5I48sW2pCjrUYMurWorwsBt453hguzOhCJ9Pbp5ewnXrQxlQv2AFv0POSW/5wnJs zovA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:subject:date :in-reply-to:message-id:mime-version; bh=bUgfLS93n3kknOgCf/rGlUYYh2ep0FyT/qlJf/H4v1c=; b=lLjlXs3UTWx+/ms+hepX6M3mP7/LbZEjAUypwDZnE6t/WO8DRUUnp3RXRfd74/le7U tSVWmML/AiJt5x/nWtNHf9/scIlMrka1xmTrbF7iCB3W96pwGv00AclaQsfMx71YkRA/ AU96GY5D2/i4hwhEap8piHwYYIdNVbhF50gZmweD9aWHnGG+1n/nln16a7jwPo7q8PjI jFuDJhgcC2lVMMNS+Jk7veEJlKxS/Pgeo7fG9ZdrVr7AfsN2hlXnUawdaSBq7vQNwYYe lVtBr7lajQmjIATYm05auedfxGvWefkn5/HBCpBxUbYc8tbFTv+pKB66SiwMv6E4CQvW ZmpA== X-Gm-Message-State: AOAM5315/NTU0DDT5LvAOEhdAhq1GCf8DWsEaxuC9EpKYJ3loetIbRCa wRz1chcL00b829/usjxAbgweTUQM8I0= X-Google-Smtp-Source: ABdhPJyZifHk89pLQYvBy/L49fAEkwWLVmaAdIaBh9HVktuYBttDnysXpHaDh1GDE0wJcBrbkCFc9g== X-Received: by 2002:a63:368f:: with SMTP id d137mr10789629pga.93.1623546185847; Sat, 12 Jun 2021 18:03:05 -0700 (PDT) Received: from tim-desktop (220-235-7-211.dyn.iinet.net.au. [220.235.7.211]) by smtp.gmail.com with ESMTPSA id v14sm9037326pgl.86.2021.06.12.18.03.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jun 2021 18:03:05 -0700 (PDT) References: <643664.1623172504@apollo2.minshall.org> User-agent: mu4e 1.5.13; emacs 27.2.50 From: Tim Cross To: emacs-orgmode@gnu.org Subject: Re: literate programming, development log -- ideas? (ominbus reply) Date: Sun, 13 Jun 2021 10:46:54 +1000 In-reply-to: Message-ID: <87o8cafuex.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=theophilusx@gmail.com; helo=mail-pg1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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=1623546236; 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=bUgfLS93n3kknOgCf/rGlUYYh2ep0FyT/qlJf/H4v1c=; b=NxU9Ddy/OxdcIPcMlCHKYABTLdcjUlCCQ2wME/93C2lv0TgeHQfsyZED6t5mqtp3mK0dvd zKpazGOFAVm3FC5m6FzfLtAhDOmD/pMZ2ohHrJpc2NMFWsQlgUsSKH1f505x8gbx7LqO07 Jb7axptNZsA3I1Mi+6/LUgLb0gEBjNPTihmRtkoHx9m8nZ9C10cZWIGYkAgWD2kQMFpIUt pwmCfhrEkVTadm5l0FB/3bZEzWshuuUCaJ8+uArDnt4WiQJG5M8QW+Zvv3Sw9gHVHnl1pw T6KwUrNyezoh+n/mwKMAPRRprsloopdnFFQJdD+eFnCuaE56KqiJbbhpR5LAVQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623546236; a=rsa-sha256; cv=none; b=gsUqSO+VHn0pn/kjZXLWJwMB8LTdSTKSdwj8mhABeButcOAdgpvbC8QcpyygBAU2sb3Q2t M5qpv0Oxt4JtR1HmEeCjIl54mGLgftHuQzELI+9JvD2eflWwHUrRUC03reWOGpCgdGaMoS B9PojcrEfxivrbK8lg0/Vtb7HyWudbaHpbBvQ9Lsb5UYCaLLH0Wx4ARysYoED13/M1+wmM SF4eD9zZ0roJp/7jlxFsScR1+tEDhiVGwhn+TCXGeah+x4lUvd0kqcxgzDebw7CEt+OTUy bm678NbuyGlSdC2UEGcVd1ZbSoWmPKRyWj8t2Jf41fur54JbGLyOGv07m4Ovcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b="Z/4Bk9DG"; dmarc=pass (policy=none) header.from=gmail.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: -1.63 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b="Z/4Bk9DG"; dmarc=pass (policy=none) header.from=gmail.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: B513923249 X-Spam-Score: -1.63 X-Migadu-Scanner: scn1.migadu.com X-TUID: Xo+VFqgBW7jr "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.