|
Nomnom Cookie posted:code review pfft. who cares
|
#
?
Mar 14, 2013 22:56
|
|
|
|
| # ? Jun 4, 2024 17:47 |
|
|
so uh i had 6 weeks to do this at first one of our liasons hosed up and told them 4 by (honest) mistake then they cut it to 2, it's due for final tests at 5pm tomorrow. i procoded and busted my rear end and i could have finished it today but if i signal to testers that i finished early i'll never escape deadline shaving. so i left a couple garbage lines in there so i technically 'do something' tomorrow. also i'm introducing them to git for the first time with this and they're all 
|
|
#
?
Mar 15, 2013 00:59
|
|
|
they hadn't met u before??????? j/k
|
|
#
?
Mar 15, 2013 01:47
|
|
|
please slap yourself that was really bad. oi
|
|
#
?
Mar 15, 2013 01:49
|
|
|
http://blog.iron.io/2013/03/how-we-went-from-30-servers-to-2-go.html Goddamn nerds worrying about their clock cycles.
|
|
#
?
Mar 15, 2013 01:51
|
|
|
Jonny 290 posted:so uh I never understood why you would use git over svn other than projects over the internet that are community driven. In a corp environment svn seems to work fine for me. 
|
|
#
?
Mar 15, 2013 01:54
|
|
|
ratbert90 posted:I never understood why you would use git over svn other than projects over the internet that are community driven. In a corp environment svn seems to work fine for me. people prefer git because if you want to create a personal branch you have to share it with everybody else and then they might see your lovely WIP.
|
|
#
?
Mar 15, 2013 02:07
|
|
|
FamDav posted:people prefer git because if you want to create a personal branch you have to share it with everybody else and then they might see your lovely WIP.
|
|
#
?
Mar 15, 2013 02:09
|
|
|
yeah i can branch some poo poo that was released to prod and goof off with it with dumb broken poo poo and just surprise them with it once its sorted. or if its a thing where it's wiser to share up front we can obv do that too providing more intel than is necessary can be bad in some areas; right now my poo poo's in demand enough that if somebody catches wind that im messing with something on the side, all of a sudden Jonny's Working On That And It Will Be Fixed Soon. Hey Jonny How's That Thing Coming Along. no no no
|
|
#
?
Mar 15, 2013 02:15
|
|
|
what do you guys use for merge conflict resolution?
|
|
#
?
Mar 15, 2013 02:21
|
|
|
well, i'm the only one actively using it right now (its lit. running on my laptop alone) and i'm basically taking them through version control 101. so i cant really answer that question. practically i can tell you that i expect very few merge conflicts based on how this facility runs. we have an ancient visualsvn server that doesnt have code past 09 on it. if i have my way, we're going to build git repos for everything and then let that old poo poo die
|
|
#
?
Mar 15, 2013 02:25
|
|
|
peepsalot posted:what do you guys use for merge conflict resolution? revolvers at high noon
|
|
#
?
Mar 15, 2013 02:49
|
|
|
peepsalot posted:what do you guys use for merge conflict resolution? click auto-merge and if that's not available select your copy of the file in the merge tool and then wonder why it doesn't work
|
|
#
?
Mar 15, 2013 03:15
|
|
|
Zombywuf posted:http://blog.iron.io/2013/03/how-we-went-from-30-servers-to-2-go.html Goddamn nerds worrying about their clock cycles. lol. "our fad lang was terrible! knowing a real lang could do way better with fewer resources, we decided to go with another fad lang."
|
|
#
?
Mar 15, 2013 03:18
|
|
|
fad lang
|
|
#
?
Mar 15, 2013 03:21
|
|
|
with a fad lang here and a fad lang there
|
|
#
?
Mar 15, 2013 03:21
|
|
|
FamDav posted:people prefer git because if you want to create a personal branch you have to share it with everybody else and then they might see your lovely WIP. thank you for being honest
|
|
#
?
Mar 15, 2013 03:23
|
|
|
I'd be super happy with git if there was a way to run it without the local repo
|
|
#
?
Mar 15, 2013 03:25
|
|
|
rotor posted:I'd be super happy with the web if there was a way to use it without a net connection
|
|
#
?
Mar 15, 2013 03:39
|
|
|
that'd be pretty cool too
|
|
#
?
Mar 15, 2013 03:57
|
|
|
rotor posted:I'd be super happy with git if there was a way to run it without the local repo what do you want to just magically edit files on the server? just make a shallow clone if you dont want history
|
|
#
?
Mar 15, 2013 04:03
|
|
|
spongeh posted:what do you want to just magically edit files on the server? just make a shallow clone if you dont want history no I just want a commit to commit directly to the server all the time, for everything
|
|
#
?
Mar 15, 2013 04:20
|
|
|
I see the confusion by 'without a local repo' I meant 'without local commits, where everything is done server side' I apologize for any confusion this may have caused.
|
|
#
?
Mar 15, 2013 04:21
|
|
|
rotor posted:I see the confusion eclipse devs hear you 
|
|
#
?
Mar 15, 2013 04:46
|
|
|
github client is another example which shows just how much nicer git becomes when only mainframe janitors have to deal with git directly and end users get to use a real application
|
|
#
?
Mar 15, 2013 05:14
|
|
|
ive been lobbying for github @ work pretty hard. if we're not gonna use svn we might as well use the good parts of git.
|
|
#
?
Mar 15, 2013 05:32
|
|
|
Win8 Hetro Experie posted:github client is another example which shows just how much nicer git becomes when only mainframe janitors have to deal with git directly and end users get to use a real application can you seriously not handle a command line i mean i use fugitive with vim now which has some nice integration but lol @ using a whole gui client
|
|
#
?
Mar 15, 2013 05:41
|
|
|
tbh if understanding git is beyond you then maybe you shouldnt be coding just a thought
|
|
#
?
Mar 15, 2013 06:56
|
|
|
abraham linksys posted:can you seriously not handle a command line believe it or not, a gui can be more convenient
|
|
#
?
Mar 15, 2013 07:07
|
|
|
FamDav posted:believe it or not, a gui can be more convenient ya when you're working 9-5 like a grown-up you just wanna click stuff on your screen until it goes away
|
|
#
?
Mar 15, 2013 07:19
|
|
|
has anyone ever tried the PLs Clean or Mercury, what was your experience
|
|
#
?
Mar 15, 2013 08:56
|
|
|
Clean was developed at my university and as far as I know it's still used there. We didn't use it in any of the classes I took though, so... that's not really an answer.
|
|
#
?
Mar 15, 2013 09:24
|
|
|
peepsalot posted:what do you guys use for merge conflict resolution? git config --global merge.conflictstyle diff3 Then use your text editor.
|
|
#
?
Mar 15, 2013 10:49
|
|
|
abraham linksys posted:can you seriously not handle a command line sure I could, but I don't even own a command line 
|
|
#
?
Mar 15, 2013 10:53
|
|
|
Gazpacho posted:has anyone ever tried the PLs Clean or Mercury, what was your experience Cleans like haskell but with some different design decisions regarding Types (uniqueness types which are theoreticaly interesting) Not really worth it to learn since haskell is so similar. Mercury is neat since it has logic programming built in but I know of only one thing built in it, the prince XML PDF thing. Basically prolog++
|
|
#
?
Mar 15, 2013 11:58
|
|
|
Win8 Hetro Experie posted:github client is another example which shows just how much nicer git becomes when only mainframe janitors have to deal with git directly and end users get to use a real application Why the gently caress would you let users near your repo?
|
|
#
?
Mar 15, 2013 12:42
|
|
|
Zombywuf posted:Why the gently caress would you let users near your repo? i meant end users as in developers who make use of version control or alternatively: all source code should be free from the tyranny of ownership and all users should be programmers
|
|
#
?
Mar 15, 2013 12:54
|
|
|
Git's interactive staging and interactive rebasing functions own Fart around on a topic branch, duplicate the topic branch, interactive rebase that poo poo against master so that the changes are pristine, fall back to the original version of the topic branch if you gently caress up (I guess you could use the reflog instead? idk i find that confusing, much better to explicitly mark a known good point by making a branch), send it off to the maintainer for review and let the reviewer see just the important stuff instead of a whole bunch of commits like "oops forgot to check this file in" or "fixed typo". I mean I'm sure you COULD make this work with SVN but there's a difference between "it can be made to work" and "it is a natural operation on the tool's internal data model" Backing your poo poo up at the end of the day is a completely orthogonal problem and I kinda wish people would stop conflating this with the actual purpose of an SCM. If you want backup then get a CJ to install a network backup agent on your workstation. SCMs are there to enable multiple people to work on multiple features within the same codebase without treading all over each other, not making sure that absolutely no work is lost if your machine catches fire all of a sudden.
|
|
#
?
Mar 15, 2013 12:55
|
|
|
I kinda feel like big projects should be broken into sufficiently small chunks that one person can understand how the whole thing works and where the boundaries of its responsibilities lie, then own that chunk and all changes to it, but it's not going to work in practice because of political bullshit (yes, I, the Senior Database Integration Engineer, am going to have my code reviewed by some loving PFY intern) so w/e I doubt it ever works like this in practice anywhere other than like maybe Linux.
|
|
#
?
Mar 15, 2013 13:01
|
|
|
|
| # ? Jun 4, 2024 17:47 |
|
|
Win8 Hetro Experie posted:all source code should be free from the tyranny of ownership and all users should be programmers Then they would all be able to use git and I would be happy.
|
|
#
?
Mar 15, 2013 13:17
|
|