search

stohrendorf / CroftEngine

An open-source Tomb Raider 1 engine remake
Other
281 stars 18 forks source link

CE-510: remove doubled pickup counters #243

Closed serishema closed 2 years ago

serishema commented 2 years ago

CE-510.

serishema commented 2 years ago

Fixup commits sound highly useful, I didn't know it was possible to in effect edit commits. I've printed your comment about them and pinned it to the board behind my PC to remind me to use them.

It should make it easier for you too if I can keep my branches mergeable by using them.

stohrendorf commented 2 years ago

Within "the git universe", it's usual to have one commit for one intention or one change. It's not a necessity, but especially within larger changes, it helps to associate changes with their corresponding commits. You're not required to make use of it, but it's certainly helpful after a review. Please keep in mind it's always helpful to regularily rebase on the target branch without squashing to keep track of the changes, otherwise it's hard to follow the actual changes and mark complaints as completed. (After all, change requests are complaints, no?) But I guess keeping track and rebasing within CE isn't that necessary as the changes are quite few. I've been working with a company where "stable master branch" was a necessity, but it's not a strong requirement in this case, so I wouldn't bother too much with being lax.