search

jtieri / habbgo

Habbo Hotel emulation implemented in Go.
5 stars 1 forks source link

Use fast-forward rebase instead of GitHub's PRs for (maintainer/local) development #12

Open emansom opened 2 years ago

emansom commented 2 years ago

See this post that goes into detail on the how and why.

Recommended git extension here. (should be available in brew, winget/scoop, AUR, etc)

Fast-forward rebase instead of merging avoids redundant commits to be created, there's also a toggle in the GitHub web UI somewhere to enforce this on PRs.

~/.gitrc required addition (avoids local Git creating merge commits during conflict auto-merging):

[pull]
        ff = only
jtieri commented 2 years ago

This looks interesting, gonna read more into this later