search

rsbivand / rgrass

Interpreted interface between the GRASS geographical information system and R
https://rsbivand.github.io/rgrass/
24 stars 8 forks source link

Adding a CONTRIBUTING file #38

Closed VLucet closed 2 years ago

VLucet commented 2 years ago

Following @florisvdh's suggestion, I am adding a small CONTRIBUTING file that explains the current plan for moving to support GRASS 8.0, as outlined by @rsbivand in #34.

VLucet commented 2 years ago

@florisvdh Yes that is unclear, I've clarified. And yes, beyond this point, main wont be contributed to directly

florisvdh commented 2 years ago

Probably best to also refer to CONTRIBUTING.md in README.md?

VLucet commented 2 years ago

Yes, done! I think the readme needs updating in general though.

florisvdh commented 2 years ago

You’re all set—the val-add-contributing branch can be safely deleted.

I've done this manually with the delete button.

Best automate branch deletion after PR-merge in the repo settings? @rsbivand

florisvdh commented 2 years ago

automate branch deletion after PR-merge

We should be careful with this idea. It needs us to always merge rgrass7 into main locally (git merge) and then push main, so never going via PRs for transferring commits between main and rgrass7 / rgrass. But perhaps that makes most sense for our workflow, restricting PRs to the addition of new commits into either rgrass7 or rgrass.

Any further ideas?

rsbivand commented 2 years ago

No, I don't think automatic deletion of branches is warranted unless they are simple issue -> PR -> merge & delete after review. I can (not knowing git well) think of backporting settings before rgrass7 is dropped completely where a branch merged with rgrass should also be merged with rgrass7, though I don't know if this is git-like.

Yes, PR's to rgrass or rgrass7 for onward merging to main makes sense. main should the be the reviewed and merged state of rgrass7 until we drop further development of rgrass7.