Date: Thu, 29 Apr 2021 13:19:39 +0100 From: Steve O'Hara-Smith <steve@sohara.org> To: Andrea Venturoli <ml@netfence.it> Cc: freebsd-questions@freebsd.org Subject: Re: Maintaining my own branch with git Message-ID: <20210429131939.067fc77833297e83188d83f8@sohara.org> In-Reply-To: <0e56b430-aac9-ab43-8a3a-7787930fcc31@netfence.it> References: <d09f4bef-cbf2-3381-b120-ee62f0fb8b53@netfence.it> <20210428131629.b644748817de331dbe2edef6@sohara.org> <0e56b430-aac9-ab43-8a3a-7787930fcc31@netfence.it>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 29 Apr 2021 14:10:55 +0200 Andrea Venturoli <ml@netfence.it> wrote: > Should I pull or push with "-f"? Just in case I wasn't totally clear you should push -f to force the changes you want into place. If the version on the server was the source of truth at this point you would want to pull - git of course doesn't know which is the source of truth so just says do one or the other. -- Steve O'Hara-Smith | Directable Mirror Arrays C:\>WIN | A better way to focus the sun The computer obeys and wins. | licences available see You lose and Bill collects. | http://www.sohara.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210429131939.067fc77833297e83188d83f8>