Consti@lemmy.worldtoProgramming@programming.dev•Does anybody actually use trunk based development in their company?
1·
6 months agoWith git. Every time we start work, we pull. After every commit, we push (and pull/merge/rebase) if necessary.
Programming and reading.
With git. Every time we start work, we pull. After every commit, we push (and pull/merge/rebase) if necessary.
We do, for two 2-3 person projects, where no code reviews are done. This is mostly because (a) it’s “just” a rewrite and (b) most new functionality is small and well-defined. For bigger features a local branch is checked out and then merged back later. Commits are always up-to-date, which makes it much easier to test integration of new featues.
Usually we don’t distinguish between many2one and one2many, since it’s the same just viewed from the other entity.
There is one more class though, which is one2one. That is, the entities have a direct relationship. Sometimes this also includes the case where you have zero or one, i.e. the relation is optional on one side. This can be accomplished with an FK plus unique constraint or by merging the tables.