Rocket.chat: git rebase > git merge when updating feature branches

[antgel]

As I mentioned in https://github.com/RocketChat/Rocket.Chat.Android/issues/1092, the same applies here. The git log is full of unnecessary merges, especially on a high-traffic project like RC. I guess it will always happen from time to time but @rodrigok what do you think about passing the message on to core contributors?

[TwizzyDizzy]

@rocket-cat close

Hi @antgel ... while I do appreciate your involvement (I really do!) I'd really like to not have discussions like this here on Github.

@geekgonecrazy could we have a developer's area in the forums? Currently there seems to be no category for development-focussed discussions like those above. I think there should be one :)

Cheers
Thomas

[antgel]

Great idea! Until there's an alternative forum where we can have such discussions, I don't see why we should close this, it will fall between the cracks. Please let me know where is a better place to discuss such matters.

[Lawri-van-Buel]

My default git config

user.name=<name>
user.email=<email>
core.autocrlf=input
core.editor=nano
color.ui=true
push.default=simple
pull.rebase=true
rerere.enabled=true
alias.s=status -s
alias.lg=log --oneline --decorate --all --graph

[antgel]

@sampaiodiego @geekgonecrazy @graywolf336 How is this still a thing? The logs are so hard to read.

[sampaiodiego]

@antgel we've been squashing pull requests commits on merge which has improved the log a lot.. here's how it looks like today:

do you still thinks it needs to improve? if so, do you have any suggestion?

[antgel]

@sampaiodiego That's not the same thing, and indeed I would expect it to cause problems if you don't throw away your feature branch, because you're rewriting history at the origin which is not reflected locally. I would suggest squashing commits on feature branches before merge with rebase -i, but not creating differences between feature branches and master, and certainly not squashing commits already in master.

Meanwhile it also doesn't solve the problem that the log is full of things like "Merge remote-tracking branch origin-master into develop-sync". Again, that's a simple master of git rebase origin/master instead of git merge origin/master, and fixing conflicts in the original commits rather than in seperate merge commits.

Just my opinion.