Working with Git

[Sterling Smith]

On Oct 7, 2016, at 2:20PM, Brandon Allbery <allbery.b at gmail.com> wrote:

> 
> On Fri, Oct 7, 2016 at 5:11 PM, Davide Liessi <davide.liessi at gmail.com> wrote:
> On the other hand there is nothing wrong in rewriting history in a
> temporary development branch (such as a branch for a pull request)
> before merging to a long living branch.
> 
> as long as it never got pushed upstream, yes. If it did, and someone else based local changes on it, they've got A Problem.

One online thread I read pointed out that rebasing can be a good thing, but that it can lead to needing to force push a branch on which others may have made local changes.  But that thread said that the solution is not less rebasing, but actually more, because if a person has set to always rebase when pulling, then their local changes will naturally be put on top of the now rebased force pushed remote.

There was some merit to Brandon's other comment: " Or just accept multiple commits instead of trying to pretend to be a neat freak after hosting a wild party."

-Sterling