News for hackers. Stuff that matters.
Re:Stay away from rebase by khasinski on Tuesday April 30, 2013 @10:35AM (#5632385)
Exactly. Keep remote history clean, keep local history dirty. Commit broken code, commit experimental features, do whatever it takes for you to write your code.

Squash, rebase interactively, rearrange, amend, merge, --no-ff before you push so other can read only a good, maintainable code served in meaningful and ordered commits.

Also rebase onto origin master often so you won't get lost in milion pages long diffs and conflicts.

There are no comments on this comment yet.