search

HyperAgents / hmas

An ontology to describe Hypermedia Multi-Agent Systems, interactions, and organizations.
https://purl.org/hmas/
1 stars 0 forks source link

Scenario manufacturing discover organization #140

Closed gnardin closed 1 year ago

gnardin commented 1 year ago

This is the first draft of the motivating scenario introducing the term hmas:Organization and the properties hmas:isMemberOf and hmas:isMaterialOf.

maximelefrancois86 commented 1 year ago

ready for merge. @gnardin ?

gnardin commented 1 year ago

Yes, it is ready to merge. Should I merge using "Merge pull request" (include all commits), "Squash and merge" (squash the commits in 1) or "Rebase and merge"?

maximelefrancois86 commented 1 year ago

definetely not "rebase"

The Golden Rule of Git Rebase Since git rebase command essentially re-writes git history, it should never be used on a branch which is shared with another developer (Unless both developers are kind of git experts). Or as its also said, never use the rebasing for public branches.

I'm unsure we decided which of the other two options is preferred in this repo.

I'd say: because you authored most of the commits, squashing is ok because it woudn't "erase" other's contributions.