|
code:code:
|
#
?
Dec 16, 2017 00:56
|
|
|
|
| # ? Jun 8, 2024 21:13 |
|
|
Sapozhnik posted:learn to interactive rebase u scrubs i think half of my commits have v. useful names like 'pisssssssssss'
|
|
#
?
Dec 16, 2017 01:22
|
|
|
tfw u make a git and the id is just a repeating string of teh weed number
|
|
#
?
Dec 16, 2017 02:47
|
|
|
Valeyard posted:people leaving merge conflict chevrons in their commits is ownage i am afraid that git ui is not the problem diff chevrons are a lot older than dvcs
|
|
#
?
Dec 16, 2017 02:48
|
|
|
i just git checkout master and then git checkout -b branchImMaking maybe im basic but when i try other ways i break things
|
|
#
?
Dec 16, 2017 02:51
|
|
|
we use svn at work, but i keep local git repos so i can branch and try poo poo without loving up stuff i've already started which isn't actually ready to commit. seems to work well enough well that's my vcs story also react brings some semblance of order to webdev which i didn't know i craved and now i'm worried i might be some kind of software crypto-fascist
|
|
#
?
Dec 16, 2017 03:05
|
|
|
Deep Dish Fuckfest posted:also react brings some semblance of order to webdev which i didn't know i craved and now i'm worried i might be some kind of software crypto-fascist yeah i've developed an appreciation for react and webpack over the past few months typescript, too. i use it for a couple npm packages that i might not have bothered to maintain without it still got "gently caress angular" written on my headband, tho
|
|
#
?
Dec 16, 2017 03:35
|
|
|
Deep Dish Fuckfest posted:we use svn at work, but i keep local git repos so i can branch and try poo poo without loving up stuff i've already started which isn't actually ready to commit. seems to work well enough seems like a good use of git to me! git-svn is good
|
|
#
?
Dec 16, 2017 04:44
|
|
|
St Evan Echoes posted:tfw your dipshit coworker does a push -f on a branch you’re both working on cis autodrag posted:i just git checkout master and then git checkout -b branchImMaking
|
|
#
?
Dec 16, 2017 09:54
|
|
|
Brain Candy posted:i think half of my commits have v. useful names like 'pisssssssssss' 
|
|
#
?
Dec 16, 2017 10:48
|
|
|
Brain Candy posted:i think half of my commits have v. useful names like 'pisssssssssss'
|
|
#
?
Dec 16, 2017 10:53
|
|
|
Peeny Cheez posted:I once got into trouble for including the poop emoji in all of my commit messages. I've caused some confusion when putting a double exclamation mark in my commit messages because apparently Bash does something extremely surprising with double exclamation marks which I've never quite figured out. All I know is backslash escaping them does the wrong thing.
|
|
#
?
Dec 16, 2017 11:48
|
|
|
Doom Mathematic posted:I've caused some confusion when putting a double exclamation mark in my commit messages because apparently Bash does something extremely surprising with double exclamation marks which I've never quite figured out. All I know is backslash escaping them does the wrong thing. The only way I remember to avoid that is using single quotes instead of double.
|
|
#
?
Dec 16, 2017 12:21
|
|
|
reviewed a pr yesterday where one of the commit messages was “Rebased”
|
|
#
?
Dec 16, 2017 15:09
|
|
|
commit messages should include the last three entries in the reflog plus the command line invocation that resulted in the commit message
|
|
#
?
Dec 16, 2017 16:35
|
|
|
Brain Candy posted:sadly i agree with this. it's just that it's also the only way it makes sense if only it also tracked the filesystem hierarchy so it could support empty directories and tracked moves & renames rather than trying to deduce them but neither of these will ever change because Linus, just like git had terribly broken Unicode filename support for a long time because Linus
|
|
#
?
Dec 16, 2017 19:44
|
|
|
Valeyard posted:ive been in current job for ugh... 2 years and 3 months since leaving uni I’ve been in current job for a few months short of 14 years and it owns
|
|
#
?
Dec 16, 2017 19:59
|
|
|
cis autodrag posted:i just git checkout master and then git checkout -b branchImMaking I’ve taken to checking out the tag for the installed (daily) build of the thing I work on to start my branch then if my branch lives multiple days I do a merge from the next daily build’s tag after I install it, etc. so what I’m working on is a strict superset of what I have installed
|
|
#
?
Dec 16, 2017 20:13
|
|
|
honestly the most annoying part of my workflow is just how many different places i have to know how to use I got one or two “small enough to just keep up with master whenever changes come in” projects, plus “huge but in git with modern practices” but it’s split across open and closed repos, and “absolutely gigantic and stuck in home-rolled vcs from the early 90s but managed locally by git so I can have some semblance of organization”
|
|
#
?
Dec 16, 2017 20:16
|
|
|
tps:
|
|
#
?
Dec 16, 2017 21:14
|
|
|
|
|
#
?
Dec 16, 2017 22:46
|
|
|
eschaton posted:I’ve taken to checking out the tag for the installed (daily) build of the thing I work on to start my branch We don't have daily builds so we just pile things in master until we cut a new version.
|
|
#
?
Dec 17, 2017 00:59
|
|
|
if there was a modern reinterpretation of the labor of Sisyphus then it would be a man trying to teach his colleagues how to loving use git properly
|
|
#
?
Dec 17, 2017 01:00
|
|
|
Sapozhnik posted:If there was a modern reinterpretation of the labor of Sisyphus then it would be
|
|
#
?
Dec 17, 2017 12:39
|
|
|
i have not yet encountered someone who was worth paying to write code, but unable to learn git even the ones who run screaming at the sight of a command prompt have so far proven capable of using a gui without destroying months of work or setting themselves on fire
|
|
#
?
Dec 17, 2017 13:10
|
|
|
Yeah, I really dont understand all that git hate/difficulties that come up in this thread so often I been using git for years. Is much much better than svn I do: git add -A git commit -m "stuff I did" git push origin blabla git pull origin blabla git checkout -b featurex git merge featurex ..etc etc I never had a single problem that wanst caused by my own stupidity, never lost a line of code because of git. It works, it does what's supposed to, and its what everyone uses
|
|
#
?
Dec 17, 2017 13:41
|
|
|
Elias_Maluco posted:never lost a line of code because of git. It works, it does what's supposed to, and its what everyone uses also it's terrible
|
|
#
?
Dec 17, 2017 16:24
|
|
|
Elias_Maluco posted:Yeah, I really dont understand all that git hate/difficulties that come up in this thread so often stockholm syndrome
|
|
#
?
Dec 17, 2017 16:47
|
|
|
cis autodrag posted:We don't have daily builds so we just pile things in master until we cut a new version. what’s the benefit of doing dailies? I’ve only seen continuous builds where it’s running one all the time, and the iteration driver is the last green full build of the iteration (possibly obtained by locking the stream and stabilizing it if a few problem tests are failing)
|
|
#
?
Dec 17, 2017 16:57
|
|
|
carry on then posted:what’s the benefit of doing dailies? I’ve only seen continuous builds where it’s running one all the time, and the iteration driver is the last green full build of the iteration (possibly obtained by locking the stream and stabilizing it if a few problem tests are failing) if your integration test suite takes eight hours it's nice to know approximately when results are expected, so everyone can be on-hand to fix anything broken in master / HEAD additionally if other software groups depend on your package, it's unlikely that they will wish to update more than once a day, or have the snapshot change underneath them during their eight hour integration you may also have continuous integration but the "daily" build is gonna serve an important purpose nevertheless
|
|
#
?
Dec 17, 2017 17:05
|
|
|
git's the only thing i've ever used and i'm good with that
|
|
#
?
Dec 17, 2017 18:26
|
|
|
carry on then posted:what’s the benefit of doing dailies? I’ve only seen continuous builds where it’s running one all the time, and the iteration driver is the last green full build of the iteration (possibly obtained by locking the stream and stabilizing it if a few problem tests are failing) is your system producing a single deliverable product? how many independent components is it built from? I work on a large product with contributions from a large number of teams, not something that lives in a single repository and builds a single executable, so daily builds provide a useful synchronization point for everyone
|
|
#
?
Dec 17, 2017 19:59
|
|
|
git's UX is garbage. git checkout is used to change branches, but also to reset a file. But reset is for a repository. Listing all of something might use a -v or -a depending on the context, likewise deleting stuff might use rm or -d. You don't even get the same help results when you use -h vs --help. The staging area is an unnecessary hoop to jump through for many people and for legacy reasons there are confusingly named options like git diff --cached to view the staging area. And then there's the whole "detached head" thing which elicits a giant "HUH?!" when it's first encountered. Edit: more eloquently stated in http://stevelosh.com/blog/2013/04/git-koans/ minato fucked around with this message at 20:20 on Dec 17, 2017 |
|
#
?
Dec 17, 2017 20:18
|
|
|
minato posted:git's UX is garbage. git checkout is used to change branches, but also to reset a file. But reset is for a repository. Listing all of something might use a -v or -a depending on the context, likewise deleting stuff might use rm or -d. You don't even get the same help results when you use -h vs --help. The staging area is an unnecessary hoop to jump through for many people and for legacy reasons there are confusingly named options like git diff --cached to view the staging area. And then there's the whole "detached head" thing which elicits a giant "HUH?!" when it's first encountered. agreed but the subset of git you actually need to know is so tiny that it doesn’t matter. any more than it matters, say, that a handful of common English verbs have totally different grammar to all the rest. you just learn the weird poo poo and get on with your life.
|
|
#
?
Dec 17, 2017 21:00
|
|
|
im fine with git, but actually preferred subversion tbh
|
|
#
?
Dec 17, 2017 21:07
|
|
|
when we used subversion, nobody ever complained about having "subversion problems" in their day to day work "git problems" on the other hand is rampant
|
|
#
?
Dec 17, 2017 21:09
|
|
|
Valeyard posted:when we used subversion, nobody ever complained about having "subversion problems" in their day to day work
|
|
#
?
Dec 17, 2017 21:36
|
|
|
Valeyard posted:when we used subversion, nobody ever complained about having "subversion problems" in their day to day work nah we called them conflicts
|
|
#
?
Dec 17, 2017 22:09
|
|
|
“i renamed a file without jumping through svn’s hoops, better throw away the repo and start again”
|
|
#
?
Dec 17, 2017 22:25
|
|
|
|
| # ? Jun 8, 2024 21:13 |
|
|
Valeyard posted:when we used subversion, nobody ever complained about having "subversion problems" in their day to day work lol just lol
|
|
#
?
Dec 17, 2017 22:29
|
|