eclipse-thingweb / eclipse-thingweb/node-wot

Change default merge strategy

Open
#558 10 comments 1 reaction 0 assignees View on GitHub
question
Dominant language
TypeScript
Stars
192
Forks
100
Avg merge
3d 2h
Merged PRs (30d)
6

Description

On PR #519 @erossignon [suggested](https://github.com/eclipse/thingweb.node-wot/pull/519#issuecomment-938353707) changing the default merge strategy from "Allow merge commits" to "Allow rebase merging". Rebasing would allow having a more linear history in the master branch where the current approach is to have merge commits of different PRs. I work with both approaches in different repositories and I have to admit I like both of them.

My take is that the current approach becomes not useful when you have _a lot of_ feature branches (a.k.a. PRs) in a short amount of time. I personally like the fact that you can understand from which PR a change was generated and use this information to look back in Github the discussion history. But of course, when you merge 20/30 Prs a week the thing is not really manageable. But this is not the case yet, looking at node-wot git graph I can still tell what's going on:
![image](https://user-images.githubusercontent.com/3170227/136756637-1220d93f-93ef-472e-8e46-0acb1bb6cb2d.png)

Please share you thoughts about this topic below :)

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.