Florent Castelli via cfe-dev <cfe-...@lists.llvm.org> writes:
> For a linear history, you can have GitHub doing a rebase when merging
> the changes instead of a merge. I would recommend to do that to keep
> the history clean and have less "fixup" or "wip" commits in the
> history.
Non-linear history doesn't casue "fixup" commits. It's perfectly fine
to clean up local history via git-rebase before pushing and doing a
merge commit via pull request.
There's a tradeoff on rebase vs. merge. A merge commit allows you to
easily revert an entire line of development with a single commit, for
example.
Good arguments can be made for both and I don't really have a preference
one way or the other but I think it's a needed conversation for the
community to have. Workflows are important.
-David
_______________________________________________
lldb-dev mailing list
lldb-dev@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-dev
