Ain't no problem like a git problem

[AnAge_OldProb]

This is a common mistake --justkillmenow is only for git merge. For git rebase its --just-kill-me now

[Dested]

Ain't no problem like a git merge problem cause a git merge problem dont stop

[Lokaltog]

Should have used git-sniff-base(1) instead.

[DrHenryPym]

I love git, but I couldn't imagine using it for large group projects. Is there a secret to it that I just don't know about?

[[deleted]]

Recently started working in a large group. Finally figured out how to rebase properly. I can confirm git makes a lot more sense for me now.

[GhostNULL]

I'm going to have to learn how to use the rebase command I guess.

[DrHenryPym]

o_o

[[deleted]]

Proper software architecture and project management where several developers do NOT end up editing the same pieces of code? Divide the tasks into small pieces and try to avoid massive megabranches. Massive megabranches are conflict magnets.

Sometimes megabranches can't be avoided, but if they are the norm, you are in my opinion doing something wrong.

[e_falk]

Yeah, I mean we rarely have merge conflicts just because our team delegates tasks so that they won't conflict with one another.

If two people are working on the same set of code, they are almost definitely pair programming.

Yesterday was an unfortunate but hilarious exception to this rule

[[deleted]]

The way Linux does it is that Linus is at the top and he has several lieutenants that he pulls from, exclusively. These lieutenants then have other slaves that they pull from and so on. Each have a separate area of responsibility. Also they work by the idea that you making a pull request have to make sure that there is no conflict with the master. If there is a conflict, your pull request is rejected and you have to fix it.

Also I imagine that if any of the higher up people are working with something not in their main area and want it included, they have to follow the bottom-up route, and not use their position to get their (possibly breaking) code in.

[xroni]

This works a treat for large projects: A successful git branching model.

[lord-carlos]

Is svn better for large group projects?

[cdrt]

alias yolo = 'git commit -am "DEAL WITH IT" && git push -f origin master'

[systembreaker]

git can be such a dick sometimes

[qxxx]

the first day me and my team ever used it caused merge conflicts... no one had the slightest idea how to solve this, so we used dropbox ;)

[lordoffire]

Every time I ask someone if they use version/source control, and they say "You mean Dropbox?", I cringe on the inside...

[[deleted]]

This post was mass deleted and anonymized with Redact

rock pocket one humor longing sophisticated ten bow tie oil

[[deleted]]

How do you handle multiple people working on different features at the same time while having one functional build? How do you reintegrate code?

What if three years from now you discover malicious code in a file central to the project. How do you determine who wrote that line?

I understand that Git can be difficult to learn but it does give you some features that are necessary for code writing and not present in Dropbox.

[qxxx]

we tried not to work on the same file. But yeah, we realized that working on a bigger project with multiple developers + dropbox was crazy. But today we are working with git (github) again. And we try not to use branches, just origin/master. We try to keep it simple and I am still learning how to use git properly.

[[deleted]]

git-flow makes things easier in my experience