svn primer translation to git

[Mitchell Horne]

On Thu, Jun 25, 2020 at 10:06 AM Ed Maste <emaste at freebsd.org> wrote:
>
> On Thu, 25 Jun 2020 at 08:56, Renato Botelho <garga at freebsd.org> wrote:
> >
> > Based on what I saw in other projects when people moved to git, a common
> > mistake that happens is people abusing `git pull` and creating merges
> > where it's not desired, like in main branch when bringing remote changes
> > to local modified repository.  Maybe it's worth to add a paragraph
> > saying some words about always use rebase instead of merge.
>
> Indeed - I started touching on that at the beginning, but we need to
> make that clear in the day-to-day use example. Probably a broad "never
> use git pull" warning too.

We should advise users to set pull.rebase in their configuration,
either globally in ~/.gitconfig or on the repository-level in
.git/config. It seems that newer versions of git will print a warning
if neither pull.ff or pull.rebase is set. It's unfortunate that we
can't include config files as part of the repository, so this will
always need to be done manually.

> _______________________________________________
> freebsd-git at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-git
> To unsubscribe, send any mail to "freebsd-git-unsubscribe at freebsd.org"