SAP/abap-file-formats merge/branch strategy

SAP / abap-file-formats

File formats that define and specify the file representation for ABAP development objects

MIT License

58 stars 55 forks source link

SAP/abap-file-formats merge/branch strategy #71

Closed larshp closed 3 years ago

larshp commented 3 years ago

Suggest setting the merge button to be squash(under repo settings)

this will give fewer commits in the main branch, one commit per PR merge

albertmink commented 3 years ago

The feature is there. The squash/rebase culture not yet.

larshp commented 3 years ago

by updating the repo settings, everything will be squashed. Squashing might not be optimal in all cases, but its good to have as the single allowed merge strategy

larshp commented 3 years ago

also, keep branches up to date before merging, something like below,

albertmink commented 3 years ago

yeah, let's setup some rules to have a clean commit history, that invites devs to look at. Admin @schneidermic0 can you configure the repo as suggested above?

schneidermic0 commented 3 years ago

I have changed the settings as suggested above

larshp commented 3 years ago

Branch protection missing? Should see something like

schneidermic0 commented 3 years ago

I have just seen it...

schneidermic0 commented 3 years ago

Branch protection has been setup as well, now. Maybe, I have to slightly change it for the JSON validation, tomorrow. I have also added that a review is required by at least one person.

larshp commented 3 years ago

cool, looks good to me, closing, we can update the settings if something needs updating