We've also been trying to follow the nvie.com git flow, including the --no-ff branch merging for our project hosted at: https://github.com/Esri/arcgis-viewer-flex
We've found that GitHub for Windows does not support --no-ff when merging our feature branches. We've also found that GitHub for Windows will create a new merge commit rather than give an error when it's syncing with the remote and the local branch is ahead of the remote branch. An issue we've found with doing "git pull --rebase" is that it will remove our merge commits. This is described in detail here: http://notes.envato.com/developers/rebasing-merge-commits-in-git/ The solution is to use these command after checking out the develop branch: $ git fetch origin $ git rebase --preserve-merges origin/develop For GUI clients, we've been happy with SourceTree and have been testing the Windows version as well: http://sourcetreeapp.com --Dasa On Mar 14, 2013, at 11:06 AM, Frédéric THOMAS <webdoubl...@hotmail.com> wrote: > Something as well which has to be done as describe here to rebase automaticly > your commit: > > https://git-wip-us.apache.org/docs/committer-practices.html > > -Fred > > -----Message d'origine----- From: Om > Sent: Thursday, March 14, 2013 6:43 PM > To: dev@flex.apache.org > Subject: Committers - preparing for Git > > On Thu, Mar 14, 2013 at 10:33 AM, Gordon Smith <gosm...@adobe.com> wrote: > >> I'm waiting until everything settles down. >> >> On Windows, do people recommend getting Git through Cygwin? > > > I use Git Bash when I have to use the commandline. But once I discovered > TortoiseGit, I find myself using Git Bash less and less. > > > >> Or nstalling the Git available at git-scm.com? If the latter, should I >> use it in Git Bash or in Command Prompt? > > > > >> Which line endings option should I choose? >> > > Take a look at this documentation here: > https://git-wip-us.apache.org/#line-endings > > And btw, every committer should read this and follow the directions here: > https://git-wip-us.apache.org/#committers-getting-started > > Thanks, > Om >
