Date: Wed, 4 Nov 2020 09:25:18 +0100 From: Serpent7776 <serpent7776@gmail.com> To: freebsd-questions@freebsd.org Subject: Re: simple shell script to compare two dirs recursively Message-ID: <20201104092518.3bc59c8b@DaemONX> In-Reply-To: <66b0d570-4e46-7971-5d30-33256feeda55@nethead.se> References: <34dfc85a-b985-e31f-a6b2-cf14f1f56fd2@nethead.se> <alpine.BSF.2.21.9999.2011021932160.72530@fledge.watson.org> <20201102220603.3b69f35c@archlinux> <66b0d570-4e46-7971-5d30-33256feeda55@nethead.se>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 2 Nov 2020 22:44:40 +0100 Per olof Ljungmark <peo@nethead.se> wrote: > It is to keep track of a Wordpress plugin that we must do changes to in > the php code, I'm just trying to figure out a way to apply our changes > after the plugin is updated and our alterations are overwritten. If you want to track changes why not using git? Make two branches: upstream and dev. upstream has code as provided by plugin developer, dev has your custom changes on top of upstream. Every time you add custom changes you do it on dev branch. When you want to update, you checkout upstream, apply update and then rebase dev onto new upstream. -- /* * Serpent7776 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201104092518.3bc59c8b>