Register a SA Forums Account here!
JOINING THE SA FORUMS WILL REMOVE THIS BIG AD, THE ANNOYING UNDERLINED ADS, AND STUPID INTERSTITIAL ADS!!!

You can: log in, read the tech support FAQ, or request your lost password. This dumb message (and those ads) will appear on every screen until you register! Get rid of this crap by registering your own SA Forums Account and joining roughly 150,000 Goons, for the one-time price of $9.95! We charge money because it costs us money per month for bills, and since we don't believe in showing ads to our users, we try to make the money back through forum registrations.
 
  • Locked thread
MononcQc
May 29, 2007

But you shouldn't need a different diff tool to make your source control work fine.

Adbot
ADBOT LOVES YOU

Stringent
Dec 22, 2004


image text goes here

MononcQc posted:

But you shouldn't need a different diff tool to make your source control work fine.

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome

MononcQc posted:

But you shouldn't need a different diff tool to make your source control work fine.

sure, it's a problem, but that's not even close to the shitfestival that is git

bobbilljim
May 29, 2013

this christmas feels like the very first christmas to me
:shittydog::shittydog::shittydog:

rotor posted:

people say this and I'm generally pretty baffled. I worked for years using svn and always used a feature branch that got merged back to trunk when it was done. SVN merging is not any harder than git if you have a decent diff tool that will automerge files for you. What you have left is the same conflicts that git would have.

was it in a team or just you? i was working in a team of 4 or 5 people and they all managed to royally gently caress up svn merges on the reg so I had to janitor it all up

git merges usually *just work*

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome

bobbilljim posted:

was it in a team or just you? i was working in a team of 4 or 5 people and they all managed to royally gently caress up svn merges on the reg so I had to janitor it all up

git merges usually *just work*

team of 12 guys. my anecdotal evidence is that I spend way more time fussing with git than I did with svn.

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome
11 guys and one girl actually

pseudorandom name
May 6, 2007

and a pizza place?

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome

pseudorandom name posted:

and a pizza place?

idgi

bobbilljim
May 29, 2013

this christmas feels like the very first christmas to me
:shittydog::shittydog::shittydog:

pseudorandom name posted:

and a pizza place?

lol

bobbilljim
May 29, 2013

this christmas feels like the very first christmas to me
:shittydog::shittydog::shittydog:
i blame coworkers tbh

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome

bobbilljim posted:

i blame coworkers tbh

epic samesies

pseudorandom name
May 6, 2007


http://en.wikipedia.org/wiki/Two_Guys_and_a_Girl

Blinkz0rz
May 27, 2001

MY CONTEMPT FOR MY OWN EMPLOYEES IS ONLY MATCHED BY MY LOVE FOR TOM BRADY'S SWEATY MAGA BALLS
we're interviewing for a junior position and i swear the second i see a woman interview here and she has any skills i'll hire her in a second just so we stop having to interview young, white men between the ages of 22 and 27

Luigi Thirty
Apr 30, 2006

Emergency confection port.

Blinkz0rz posted:

we're interviewing for a junior position and i swear the second i see a woman interview here and she has any skills i'll hire her in a second just so we stop having to interview young, white men between the ages of 22 and 27

wow reverse sexism I am informing reddit

Blinkz0rz
May 27, 2001

MY CONTEMPT FOR MY OWN EMPLOYEES IS ONLY MATCHED BY MY LOVE FOR TOM BRADY'S SWEATY MAGA BALLS
go for it!

smash the patriarchy bithc

MeruFM
Jul 27, 2010

Blinkz0rz posted:

we're interviewing for a junior position and i swear the second i see a woman interview here and she has any skills i'll hire her in a second just so we stop having to interview young, white men between the ages of 22 and 27

does that mean you're going to reject every non-woman until you find one?

suffix
Jul 27, 2013

Wheeee!

Blinkz0rz posted:

we're interviewing for a junior position and i swear the second i see a woman interview here and she has any skills i'll hire her in a second just so we stop having to interview young, white men between the ages of 22 and 27

what about black or old people?

tef
May 30, 2004

-> some l-system crap ->

rotor posted:

team of 12 guys. my anecdotal evidence is that I spend way more time fussing with git than I did with svn.

same, but also github

Soricidus
Oct 21, 2010
freedom-hating statist shill
my anecdotal evidence is that i spend way more time fussing with git than i did with clearcase, but that's because people actually use git instead of coming up with creative excuses for not bothering with revision control because clearcase is so bad

i don't know why we never tried svn but i used it for some open source things once and it seemed ok, but i never really saw the point of branching until i switched to git so that's why i think git is better at branching

FamDav
Mar 29, 2008

tef posted:

same, but also github

wait does heroku really use github

are you guys using enterprise or do you just pay for the private repos

lol

Blinkz0rz
May 27, 2001

MY CONTEMPT FOR MY OWN EMPLOYEES IS ONLY MATCHED BY MY LOVE FOR TOM BRADY'S SWEATY MAGA BALLS

suffix posted:

what about black or old people?

hell yeah

although we don't have any female developers in the company which is kind of bullshit. other minority groups are deffo represented

hobbesmaster
Jan 28, 2008

FamDav posted:

wait does heroku really use github

are you guys using enterprise or do you just pay for the private repos

lol

everybody uses github, its like synonymous with git at this point

MononcQc
May 29, 2007

FamDav posted:

wait does heroku really use github

are you guys using enterprise or do you just pay for the private repos

lol

We're like one of the biggest github users in the world apparently.

kitten emergency
Jan 13, 2008

get meow this wack-ass crystal prison
soundcloud uses github

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome

MononcQc posted:

We're like one of the biggest github users in the world apparently.

you & yahoo

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome
I don't understand why people use github in a world where gitlab exists

MononcQc
May 29, 2007

I came in and it was like that :shrug:

Valeyard
Mar 30, 2012


Grimey Drawer
just like git, github is also fine. nothing wrong with it

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome

Valeyard posted:

just like git, github is also fine. nothing wrong with it

if you use git i have no idea why you wouldn't use gitlab or hub or whatever

rotor
Jun 11, 2001

classic case of pineapple derangement syndrome

MononcQc posted:

I came in and it was like that :shrug:

I mean other than the most common reason

Moo Cowabunga
Jun 15, 2009

[Office Worker.




I hired a French guy to erect fences and chop my firewood for food and board.

BONGHITZ
Jan 1, 1970

wee

karms
Jan 22, 2006

by Nyc_Tattoo
Yam Slacker
nobody ever talks about hg. like opera, its way better than the competition but nobody cares about it and gets shunned into exile

vodkat
Jun 30, 2012



cannot legally be sold as vodka

KARMA! posted:

nobody ever talks about hg. like opera, its way better than the competition but nobody cares about it and gets shunned into exile

I'm unironically using opera right now.

Moo Cowabunga
Jun 15, 2009

[Office Worker.




why

vodkat
Jun 30, 2012



cannot legally be sold as vodka
Because I'm using a windows computer.

vodkat
Jun 30, 2012



cannot legally be sold as vodka
And what else is there?

IE? said nobody ever

Chrome? gently caress google erryday

Firefox? just lol


Considering how poo poo everything else on windows is Opera is p decent in comparison.

Soricidus
Oct 21, 2010
freedom-hating statist shill

vodkat posted:

And what else is there?

IE? said shaggar

and also every corporate it department and enterprise software vendor in the world

prefect
Sep 11, 2001

No one, Woodhouse.
No one.




Dead Man’s Band

vodkat posted:

I'm unironically using opera right now.

Adbot
ADBOT LOVES YOU

Brain Candy
May 18, 2006

same, but safari

  • Locked thread