Discussion about the "best" methods of git

[Lukas Haigner]

Hey guys,

This discussion is about git merging, the best merging method with no annoying merge commits, hopefully without rebase, commiting, the best commiting method / strategy about when you should do a commit or when not and avoid annoying names for commits, also without rebasing if possible and finally rebasing, avoid "bricking" / breaking git, unremovable commits and over strange things what're happening in rebase. I'm excited about the answers!

Thanks,
Lukas

[Kanwar]

Hi @Lukas Haigner,

Does the following discussion help?

https://developer.atlassian.com/blog/2014/12/pull-request-merge-strategies-the-great-debate/

Regards,

Kanwar