+1

We can also create "top" Jira including sub-tasks (corresponding to commit).

I also recommend to squash the changes.

Here's what I do:
- when I create on a ticket, I create a branch
- I commit on this branch, and I can have multiple commits
- I rebase with the upstream branch
- I "squash" all commits related to my change in one "big" commit using git rebase -i
- eventually, I can change the comment with git -amend
- I cherry-pick on the target upstream branch

Like this, I may have bunch of "micro" commits on my branch, but a "big" squashed commit related to the same change/Jira.

Just my $0.01

Regards
JB

On 01/11/2016 12:24 PM, Serge Huber wrote:

Hi guys,

I’d like to propose that we adopt in this project the same convention as other 
Apache projects that we have a ticket for each commit. This makes it a lot 
easier to track things and create release notes.

Then, in the commit, we should make sure to always reference a UNOMI-XXX 
ticket. If you are committing something without a ticket number, then you know 
something is not right :)

I think it should be fine to create “larger” tickets for small commits. We were 
discussing this offline with Chris, who is working on documentation and this 
way he can commit documentation updates without having to create a new ticket 
each time. These tickets could simply be closed and re-opened at need.

What do you think of this ? Is there maybe a better way to do this ? I’m 
especially looking for input from people more experiencing with Apache projects 
(mentors ?) that may have best practices we could reuse here ?

cheers,
   Serge…


--
Jean-Baptiste Onofré
[email protected]
http://blog.nanthrax.net
Talend - http://www.talend.com

Reply via email to