Using Flare's Git integration, it appears to be using merge commits in lieu of rebasing. We'd like to use rebasing - does anyone know if Flare supports this?
Merge commits mean that each time a writer synchronizes, Flare commits the user's local changes, pulls the latest files, and merges the two, creating two entries in Git (a commit, and a merge request). On a large team of writers all with different versions of the project there's a lot of confusing merging going on.
Rebasing would make the history streamlined by first pulling the latest files, then attempting to commit local chances on top of those if there are no conflicts.
Git rebase?
Re: Git rebase?
Ever get an answer to this anywhere? We want to do this as well?