Re: git-merge(1) prior to a PR in in the github.com/freebsd area

Reply: Graham Perrin : "git-rebase(1) prior to a PR in in the github.com/freebsd area"
In reply to: Graham Perrin : "git-merge(1) prior to a PR in in the github.com/freebsd area"
Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Steve O'Hara-Smith <steve_at_sohara.org>
Date: Sun, 27 Aug 2023 07:36:31 UTC

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>