News for hackers. Stuff that matters.
Re:Nobody Cares About Your Git History by e61133e3 on Friday January 26, 2024 @07:08AM (#39141763)
We have ticket IDs in the branch names. Also a nice Jira <-> GitLab integration. When branch is merged the ticket status is updated.
Re:Nobody Cares About Your Git History by l72 on Friday January 26, 2024 @08:45AM (#39142514)
We also name all branches after our Jira tickets, and our merge commit into the main branch is always: `TICKET-XXX - TICKET SUMMARY`. When we close the ticket in Jira, we also link back to the merge commit.

The Merge commit also updates the ChangeLog with the `TICKET-XXX - TICKET SUMMARY`.

That makes it really easy to trace things, as you can:

  - Look at the ChangeLog
  - Do a `git log --first-parent`
  - Look at a Jira Ticket and jump straight to the merge commit
We also have policies in that every commit to master must be a merge commit and associated with a Jira Ticket. Also, each branch is tied to one and only one Jira Ticket.