I am still struggling with git. My current issue is how to prepare a multi-commit branch. For example, I worked on the TS-995 branch locally for a while, doing multiple commits. I had to merge from master to it a time or two, to track other changes. The question is, what is the best process for committing that globally?
1) Should I merge to master locally first, then commit master, or commit directly from the branch? 2) How are commit messages to be done to be useful? Do I have to use the same commit message every time on the branch, to be sure that it shows up on the ATS repository? Should I do a rebase and tweak the message there? Use git commit --amend? I tried "git merge --no-ff ts-995" but that didn't let me set the commit message. I think I'll write a Perl script to do the rebase, which will both squash the branch commits and make the commit message useful.
