I'll take a shot at these :) On Mar 19, 2013, at 4:04 PM, Justin Mclean <[email protected]> wrote:
> Hi, > >> I used a test git repo to experiment with different scenarios by first going >> through this tutorial: >> http://try.github.com >> >> You could of course skip the tutorial and just create a test git repo >> directly at github.com > > I think most of us are aware and can use the basic git commands. I don't > think that's the issue. What seems to be the issues is that's rules about > which (possibly obscure) options we should be using and what is missing is > this discussion is how they apply to our project, what happens if you don't > use them and how to get out of trouble when things go wrong. > > For instance why did my commit email the list about a merge in my local > develop branch (to README) that no one should care about? Have we just got > the email change messages configured incorrectly or are messages about local > merges useful to everyone in some way? [DP] - I think you did a pull and had local commits on your develop branch and there were commits on the remote so it had to create a merge commit on your develop branch to bring them together. This could have been avoided using git pull --rebase or see my earlier email. > > If you use rebase as far as I can see there no command to undo what you done > if you make a mistake. How can we make it safer to use for people new to git? [DP] - The only option I know of is to copy the whole repo directory on your disk and then restore it if rebase goes wrong for you. > > Do we really want to encourage new Git users to use rebase globally when > there seems to be a lot of information out there saying this can be dangerous. [DP] - I don't think so. See: http://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/ > > How do we mark up JIRA tickets to indicate what changes have been made? [DP] - I think there was a thread where this was being worked on. > > How do we work out what changes have been applied to a branch? [DP] - You can use various tools to see the log of commits. > > How do we work out what changes have gone into a release? [DP] - following the git flow workflow, you'd just need to see the changes made in the merge commit from the release branch to the master branch. See "Finishing a release branch" at: http://nvie.com/posts/a-successful-git-branching-model/ > > Also a lot of the Git advice out make certain assumptions (ie you work all > the time in master) so may be confusing to new people as our setup is > slightly different. > > Thanks, > Justin
