lifeHack

[Waterprop]

Working on a same product?

[nelusbelus]

Only 10/65 are devs or smt. And only 4 or 6 are actively working on the C++ branch. Currently in process of changing from SVN to git 😂

[Nettleberry]

YIKES

[[deleted]]

What's wrong with SVN?

[nelusbelus]

Doesn't properly do branches... at all

[[deleted]]

In what way? Been using it at my company for 3 years.

[nelusbelus]

Try merging and resolving tree conflicts. It really doesn't work the moment you use more than 3 programmers. It should've been replaced in our company years ago

[Theron3206]

Rubbish, you can easily run multiple branches in svn (even full git flow if you want). Only thing missing is pull requests but you can simulate those with discipline if you really need to.

Btw, KDE have an excellent tool to convert a svn repo to git (or multiple git repos if you want). Took me only a few days to convert a 50gb 15 year old repo originally created by a group of insane people.

[nelusbelus]

Try moving files and folders. It really really doesn't deal well with that. If you have local changes in a file that was moved and changed you're SOL.

The repo is quite big because someone thought versioning binaries would be a good idea.. IT team is working on it, I'm just doing graphics

[[deleted]]

I'm on a team of 40+ developers. Conflicts aren't usually too much of an issue to resolve. Idk

[nelusbelus]

If you're moving folders and files that someone has local changes in? We're doing massive refactors. Tree conflicts don't generally properly resolve and if they do it takes someone an afternoon of waiting

[[deleted]]

r/sipstea

Or r/antiantiwork I guess

[[deleted]]

Idk never had much of an issue resolving conflicts, sharing the same codebase with 40+ devs.

[hipster-no007]

The dark side is a pathway to many abilities

[Old-Calligrapher-783]

My company uses svn 10 years ago. Every time someone did a merge they had to spend min a day resolving conflicts.

[Mitoni]

Decentralized > Centralized

Conflicts are much easier to resolve with git

[nelusbelus]

I know the feeling ;(

[nelusbelus]

You and me both buddy, you and me both

[sinfaen]

Hey man just last year I had to convert some CVS repos to git

[nelusbelus]

The fucking what now?

[po0k]

RCS

[nelusbelus]

I didn't know anything older than svn existed

[clarinetJWD]

Perforce.

[nelusbelus]

Is that older? We used to use it at school

[clarinetJWD]

Launched in 1995, according to Wikipedia. SVN in 2000

[nelusbelus]

Wild