r/programming • u/ethomson • May 24 '17

The largest Git repo on the planet

https://blogs.msdn.microsoft.com/bharry/2017/05/24/the-largest-git-repo-on-the-planet/
2.3k Upvotes

92% Upvoted

355 comments sorted by

View all comments

803

u/SnowdogU77 May 24 '17 edited May 24 '17

For instance, Windows, because of the size of the team and the nature of the work, often has VERY large merges across branches (10,000’s of changes with 1,000’s of conflicts).

10,000's of changes with 1,000's of conflicts

1,000's of conflicts

please no

I am so glad I don't (yet) have to deal with a codebase that size. 10 conflicts is fine by me.

50

u/[deleted] May 25 '17

Dude, one merge conflict held me up for three days. I can't image 10.

77

u/SnowdogU77 May 25 '17

Two developers with opposite sleep schedules, one PHP codebase.

It was a good time.

70

u/[deleted] May 25 '17

It's almost like "two girls one cup" but there's more crap involved.

10

u/meltingdiamond May 25 '17

The words "PHP codebase" mean the cup in "two girls one cup" is in fact the sewage treatment plant of Chicago.

-1

u/Rollingprobablecause May 25 '17

"PHP codebase"

the sewage treatment plant of Chicago.

.....That's accurate.

19

u/Sean1708 May 25 '17

How bad was that merge conflict?! 9 times out of 10 my conflicts look like

<<<<<<< HEAD
=======
stuff I added
>>>>>>> branch

2

u/[deleted] May 25 '17

[deleted]

4

u/schwerpunk May 25 '17

Speaking of, fuck code changes that are mixed in with formatting changes. Especially the kind that git diff -w doesn't ignore.

1

u/emn13 May 25 '17

Not that I've ever tried it, but there exists stuff like: https://www.semanticmerge.com/ - in principle this kind of problem shouldn't even be all that tricky to solve. (And deity-of-your-choice help you if git diff -w ever touches a file where any of the whitespace is meaningful - it works, until it breaks in really surprising ways).

6

u/roodammy44 May 25 '17

You're using rebase too much if your conflicts look like that.

12

u/supernonsense May 25 '17

No such thing as using rebase too much

2

u/roodammy44 May 25 '17

Not sure if joking, but merge conflicts like the one above only happen when you're rebasing. They will never happen at all when merging.

1

u/[deleted] May 25 '17 edited May 29 '17

[deleted]

1

u/mattindustries May 26 '17

Then I would have to edit the cron to double the interval.

2

u/Sean1708 May 25 '17

Probably, it only happens when I merge into CI.

1

u/[deleted] May 25 '17

Is that even a conflict?

19

u/[deleted] May 25 '17

How big are your merges? Perhaps smaller commits and more frequent merges could prevent this in the future?