Date: Sun, 27 Aug 2023 08:36:31 +0100 From: Steve O'Hara-Smith <steve@sohara.org> To: questions@freebsd.org Subject: Re: git-merge(1) prior to a PR in in the github.com/freebsd area Message-ID: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> In-Reply-To: <e49bc6e0-1380-0dc9-40ab-8865ae546a74@gmail.com> References: <e49bc6e0-1380-0dc9-40ab-8865ae546a74@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 27 Aug 2023 06:30:12 +0100 Graham Perrin <grahamperrin@gmail.com> wrote: > I have a checkout of > <https://github.com/grahamperrin/freebsd-src/pull/3>, and need to squash > before I create a PR at <https://github.com/freebsd/freebsd-src/pulls>, > but I can't make sense of git-merge(1). > > <https://git-scm.com/docs/git-merge>; > > Can anyone steer me? IME git rebase is more useful that git merge. -- Steve O'Hara-Smith <steve@sohara.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230827083631.192eb52f7b99e9ebd6b54ccf>