News for hackers. Stuff that matters.
Re:Y U NO commit?? by madeofpalk on Monday October 20, 2014 @08:50AM (#8481822)
> My biggest concern here is, that you have to force push because of you rewrite the git history. That way you are most likely going to loose data.

Not entirely true. If you only squash when you merge the branch in, there's no need for the force-push.

Rebasing into the already pushed history should be flat out banned without question within teams, and force-push be disabled within configs. It's only in exceptional circumstances where you would actually need to do these.

Re:Y U NO commit?? by cjantz on Tuesday October 21, 2014 @06:37AM (#8486731)
Exactly!

But why do you need to squash while merging? The concept of merge tells that a branch is merged into the history by adding a merge commit. This commit reflects all differences. It's done automatically if possible - you need to resolve conflicts if it's not.

Correct me if I'm wrong but in my understanding a merge does nothing else than create a commit which is like a squashed representation.