IRCloggy #git 2022-09-22

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2022-09-22

← StarlitMantis left00:02
← Starlit left00:02
← rama left00:03
→ rama joined00:03
→ nate2 joined00:04
→ bambanxx joined00:04
→ Jong joined00:09
← nate2 left00:09
← rama left00:11
→ rama joined00:11
→ atrigent_ joined00:13
← atrigent left00:13
← BlessJah left00:17
→ BlessJah joined00:18
← peirik_ left00:31
← elastic_dog left00:33
→ elastic_dog joined00:38
→ lucasta joined00:40
→ n1terr0rs joined00:43
← niterrors left00:45
→ phonixgeist joined00:46
→ loulou joined00:47
← phonixgeist left00:47
← OnkelTem left00:47
← vyryls left00:54
← Ram-Z left00:55
← moldorcoder7 left00:57
← n1terr0rs left01:03
→ vaaleyard joined01:03
→ n1t3rr0r5 joined01:04
→ arescorpio joined01:04
← chexum left01:05
← ghost43 left01:05
← FinnElija left01:05
← gxt left01:05
← fling left01:05
← crabbedhaloablut left01:05
← adanwan left01:05
← opal left01:05
← kevr left01:05
→ chexum joined01:06
→ crabbedhaloablut joined01:06
→ adanwan joined01:06
→ gxt joined01:06
→ kevr joined01:06
→ FinnElija joined01:06
→ opal joined01:06
→ ghost43 joined01:06
→ fling joined01:06
→ Ram-Z joined01:08
← lucasta left01:14
← gsi left01:16
← lionkor left01:17
→ gsi joined01:18
← Murr left01:21
→ Murr joined01:21
→ ThorMojito joined01:22
← remyabel2 left01:26
← zumba_addict left01:27
← ThorMojito left01:29
← rama left01:29
→ rama joined01:30
→ mgedmin joined01:33
← rama left01:40
→ rama joined01:40
← LiENUS left01:46
→ LiENUS joined01:46
← Jenna16bit left01:51
→ Jenna16bit joined01:53
← vdamewood left01:57
← madewokherd left02:01
← arescorpio left02:02
← gxt left02:02
→ madewokherd joined02:03
→ n1ghterr0rs joined02:04
→ gxt joined02:04
← n1t3rr0r5 left02:06
← rama left02:08
→ rama joined02:12
← rama left02:16
→ Wh0 joined02:18
← derpydoo left02:19
← Wh0 left02:19
← rgrinberg left02:26
→ rama joined02:40
→ nate2 joined02:41
← madewokherd left02:42
← pulse left02:44
← drogas left02:44
← tkazi left02:45
← rama left02:45
→ rama joined02:45
→ madewokherd joined02:47
→ tkazi joined02:48
→ peirik_ joined02:53
← rama left02:57
← loulou left03:05
→ rama joined03:08
→ rgrinberg joined03:08
← n1ghterr0rs left03:14
→ n1ghterr0rs joined03:14
→ lucasta joined03:23
← rama left03:25
→ rama joined03:25
→ bn_work joined03:31
bn_work hi, git 2.24.3, how does one temporarily override a local directory specific .gitattribute file in one's tree during checkin?03:31
→ manin891 joined03:33
bn_work .gitattributes there is basically `* text=auto` `*.patch text eol=crlf`, and I temporarily want to override the 2nd03:33
← nate2 left03:34
→ jazzy joined03:36
← slaughter left03:41
→ hbautista joined03:42
→ agarr joined03:44
← agarr left03:49
← rama left03:50
← tyson2 left03:51
→ vyryls joined03:52
bn_work ok, I just ended up temporarily editing .gitattributes to get around it, not sure if there was a better way during commit03:53
different Q: have two machines A & B on same branch, and do dev 95% on A, had forgotten I had committed something to the branch on B but when I `git stash && git pull && git stash pop` I got a conflict for a single file, I edited and resolved it but when I was about to mark it as resolved, `git status` shows there are a bunch of random other files listed as "Changes to be committed", why? and is there a way I can remove them from03:58
staging w/o specifying each one? (I tried the suggested `git restore --staged *` but it just reports `error: pathspec: '.foo.swp' did not match any file(s) known to git`)03:58
and shows the same status output03:58
→ nate2 joined04:00
← ghost43 left04:02
→ rama joined04:02
← rgrinberg left04:02
→ ghost43 joined04:02
← dermoth left04:04
→ dermoth joined04:04
← jetchisel left04:04
← gast0n left04:04
← cdown left04:06
→ jetchisel joined04:07
← bambanxx left04:07
← nate2 left04:09
→ Sasazuka joined04:14
← Sasazuka left04:14
← peirik_ left04:17
← rama left04:19
→ junebug joined04:21
← vaaleyard left04:23
→ vaaleyard joined04:23
← jetchisel left04:28
← lucasta left04:30
← vaaleyard left04:31
→ ghost43_ joined04:31
← ghost43 left04:33
← kevr left04:35
→ kevr joined04:36
→ n1ght3rr0r5 joined04:36
← n1ghterr0rs left04:39
→ niterrors joined04:40
← n1ght3rr0r5 left04:41
← Visne left04:42
→ madewokherd` joined04:46
→ FH_thecat joined04:47
← madewokherd left04:49
→ Visne joined04:52
← bloody_ left04:58
← crabbedhaloablut left05:01
→ crabbedhaloablut joined05:01
← FH_thecat left05:03
→ otisolsen70 joined05:05
← otisolsen70 left05:06
→ otisolsen70 joined05:07
→ rgrinberg joined05:09
← rgrinberg left05:20
→ srinidhi joined05:22
→ Ajax1465 joined05:31
← Ajax146 left05:33
Ajax1465 → Ajax14605:33
← kevr left05:33
← Visne left05:34
→ kevr joined05:34
→ rgrinberg joined05:38
← manin891 left05:40
→ Visne joined05:42
← rgrinberg left05:43
→ manin891 joined05:43
← riposte left05:46
→ vdamewood joined05:48
→ riposte joined05:53
← jazzy left05:54
→ vinleod joined05:54
← vdamewood left05:55
vinleod → vdamewood05:55
← imp left05:55
→ rgrinberg joined06:01
→ rama joined06:02
→ n1terr0rs joined06:03
← niterrors left06:05
← rgrinberg left06:05
→ nate2 joined06:06
→ carl-- joined06:08
← thiago left06:09
← hbautista left06:10
← nate2 left06:11
→ mexen joined06:13
← riposte left06:14
→ riposte joined06:19
→ hrberg joined06:27
→ zeenk joined06:28
→ rgrinberg joined06:28
→ rfuentess joined06:34
→ csm3105 joined06:35
→ terminaldweller joined06:36
→ coot joined06:39
→ n1t3rr0r5 joined06:45
→ tulpa_ joined06:47
← n1terr0rs left06:47
← rgrinberg left06:49
→ FH_thecat joined06:50
← Ingvix left06:51
→ Ingvix joined06:53
← FH_thecat left06:55
→ n1ghterr0rs joined06:56
← rama left06:57
→ rama joined06:58
← n1t3rr0r5 left06:58
→ igemnace joined06:59
→ n1ght3rr0r5 joined07:00
→ MajorBiscuit joined07:01
← n1ghterr0rs left07:01
→ gas51627 joined07:02
← rama left07:07
→ mobidrop joined07:12
→ niterrors joined07:15
← junebug left07:17
← n1ght3rr0r5 left07:17
→ Masklin__Gurder joined07:23
→ theoceaniscool joined07:24
← tulpa_ left07:26
→ rama joined07:28
→ sQVe joined07:29
→ rgrinberg joined07:30
→ vladoski joined07:30
← rgrinberg left07:34
→ dionysus69 joined07:35
← rama left07:36
← nighterrors left07:37
Masklin__Gurder → Masklin07:39
→ jetchisel joined07:39
← FinnElija left07:43
→ maret joined07:44
→ FinnElija joined07:44
→ feriman joined07:45
→ iomari891 joined07:51
→ OnkelTem joined07:52
← hoochmonger left07:52
osse bn_work: quote the * so that it's git that expands it07:52
you can also use 'git reset'07:53
when you get conflicts when popping the stash the merge machineryt kicks in, and when that's done all changes in the stash are staged. it's annoying07:53
← niterrors left07:54
→ RiFo joined07:54
← hamburgler left07:54
→ niterrors joined07:54
← niterrors left08:00
← mexen left08:02
→ niterrors joined08:02
→ Alphare joined08:08
Alphare Hi all. Is it possible to override a gitignore locally? I don't want to add a pattern, I want to remove one, but only for myself.08:09
→ Smith42 joined08:09
← hqdruxn08 left08:10
osse I think the in-repo .gitignore files have the highest precedence, unfortunately. But you can try .git/info/exclude08:11
→ drogas joined08:11
Alphare could I negate this pattern somehow in the .git/info/exclude file?08:13
← skapata left08:14
selckin !pattern08:14
osse Can I ask what the usecase is? Do you plan to add the matching file(s) to the repo?08:15
Alphare the main repo has some scripts that setup all nested repos of the project (not subrepos, just cloned in the main directory), the top-level .gitignore includes a `/prefix-*/` pattern to exclude these repos from the top-level repo08:17
which is reasonable08:17
but that means that my vscode/ripgrep use is completely useless08:17
so since I basically never contribute to the top-level repo (and if I do there are safeties in places so I don't commit everything below), I'm thinking this is the approach08:19
but maybe I'll have other issues08:19
→ rgrinberg joined08:19
Alphare (one more point for monorepos :P)08:19
→ Masklin__Gurder joined08:19
→ atrigent joined08:19
← Masklin left08:19
← atrigent_ left08:20
osse seems like .rgignore can be used to override .gitignore08:21
Alphare ah08:21
:)08:21
I'm not having much luck with the pattern negating08:23
← feriman left08:23
Alphare I'm looking at the problem between runs of benchmarks08:23
osse I think you need two negations, one for the dirs themselves and one for the contents08:23
try:08:23
!/prefix-*08:23
!/prefix-*/08:24
(both, in that order)08:24
← opal left08:24
→ opal joined08:25
← dionysus69 left08:26
→ k1773_ joined08:27
Alphare oooh that worked08:27
← k1773_ left08:27
→ k1773_ joined08:27
Alphare in the .rgignore08:27
thanks a lot08:28
files are still greyed out, so I'll try in the .git/info/exclude and see if that becomes a problem08:28
thanks again osse08:28
→ feriman joined08:29
← k1773 left08:30
Alphare doesn't work, seems like there is no overriding the top-level .gitignore, shame08:32
(that said, I'm not sure about what we offer in Mercurial to fix this issue either, heh)08:32
osse Alphare: have you integrated rg into vscode or does that require yet another solution?08:33
Alphare vscode uses rg internally :)08:33
which is great both for this problem and in general08:33
I'm losing almost all git IDE features (like showing changed lines, diff, etc)08:34
so it's not ideal08:34
but it's not my main work repository, I'm just consulting on the project08:34
the project uses git so it's not ideal either /troll08:34
→ arch_angel joined08:35
→ otisolsen70_ joined08:35
osse heh, I'm kinda the opposite. Showing changes lines where I edit the text is distracting for me08:35
I prefer a diff somewher eelse08:36
Alphare interesting08:36
I just mean the gutter color08:36
this was changed/added/removed since last commit08:36
I find it quite useful, also with the file minimap that shows that information, allowing you to go where you changed things in codebases where you don't know everything by heart (which is most of them)08:37
← otisolsen70 left08:37
← Betal left08:38
osse I'm used to VS at work which doesn't have this, at least not by default. VSCode looks like a disco08:38
But I'm getting there08:38
Alphare heh08:39
→ carl--- joined08:40
← rgrinberg left08:41
→ otisolsen70__ joined08:41
osse maybe I'm just getting old08:41
← carl-- left08:42
← otisolsen70_ left08:44
→ dionysus69 joined08:44
→ cdown joined08:44
← dionysus69 left08:49
→ dionysus69 joined08:49
→ dante-as joined08:50
← dionysus69 left08:53
→ dionysus69 joined08:54
← vdamewood left08:54
← opal left09:00
→ remyabel2 joined09:01
→ opal joined09:01
← very_sneaky left09:02
→ nate2 joined09:03
→ tulpa_ joined09:03
→ very_sneaky joined09:04
← dionysus69 left09:04
→ dionysus70 joined09:04
dionysus70 → dionysus6909:06
← adanwan left09:07
→ adanwan joined09:08
← nate2 left09:08
← otisolsen70__ left09:09
→ bgs joined09:14
Masklin__Gurder → Masklin09:21
→ xx joined09:24
← vladoski left09:30
→ vladoski joined09:30
← travisghansen left09:33
→ travisghansen joined09:34
← terminaldweller left09:35
→ hqdruxn08 joined09:36
→ rgrinberg joined09:36
bremner umm. So I have a student that managed to delete origin/HEAD (on a plain https served git repo, no forge machinery). Can this be recovered somehow? I don't have easy shell access, but I guess I can puppet our admin if I have to.09:37
← momomo left09:38
→ peirik_ joined09:38
→ momomo joined09:39
bremner ugh. All my search results are polluted with github09:39
→ Swahili joined09:42
← rgrinberg left09:42
← peirik_ left09:43
← hqdruxn08 left09:43
another| delete where?09:45
bremner well, it's gone from git ls-remote09:45
I suspect what they really did is delete the branch it points to09:46
it seems to be a botched switch from master to main as default branch09:46
→ terminaldweller joined09:47
← bgs left09:49
bremner I suppose in principle running "git symbolic-ref HEAD refs/heads/main" in the remote repo should do it.09:49
But that's not super convenient.09:49
another| did they delete that on their local machine or on remote?09:50
bremner on the remote09:50
→ YuGiOhJCJ joined09:51
another| errr.. why does the renote have an origin? is it a mirror?09:52
→ gryffus joined09:53
bremner I don't understand your question. origin/HEAD is just what git-ls-remote shows09:53
→ lionkor joined09:53
← YuGiOhJCJ left09:54
→ YuGiOhJCJ joined09:54
bremner err. OK, maybe it's what git branch -r shows09:55
osse bremner: does the repo have some sort of web ui?09:55
bremner no09:56
→ hqdruxn08 joined09:56
osse then you gotta shell it up, gangnam style09:56
bremner ok09:56
osse HEAD is gone from ls-remote, right? not origin/HEAD?09:57
bremner right09:57
osse bremner: AKSHUALLY I think you can use git remote set-head09:57
bremner osse: to change the remote?09:58
osse yes09:58
bremner I mean, the remote repo?09:58
osse ehh nvm, i misunderstood the docs09:58
bremner yeah, I had to try it to understand the docs.09:58
osse you gotta shell like hell, to the shellmobile09:59
another| so let me get this straight: someone somehow managed to delete HEAD on a remote bare repo?09:59
osse shell it like a polaroid picture09:59
yeah that student should either be expelled or get hired10:00
bremner another|: no, they just ran "git push --delete master", or some such10:00
clone tells the story: warning: remote HEAD refers to nonexistent ref, unable to checkout.10:01
another| so `git branch -r` shows what?10:01
bremner origin/main10:01
→ mexen joined10:05
← magic_ninja left10:06
← maret left10:07
→ magic_ninja joined10:07
← magic_ninja left10:07
another| I guess you want to run `git symbolic-ref HEAD refs/heads/main` on the bare repo10:07
→ magic_ninja joined10:08
osse bremner: ah, so it's not actually deleted. it's just a broken symlink so to speak10:08
(fun fact, in early days of git HEAD was actually a symlink)10:09
bremner osse: right. the output of "git ls-remote" could be more helpful here10:09
osse in that case you just need to recreate whatever HEAD pointed to in the bare repo10:10
push up a new branch named master (presumably) or main10:10
bremner but I probably want to do the symbolic-ref thing anyway, so clone does the right thing?10:11
osse no10:11
well, if you want to change it, sure10:11
→ maret joined10:12
bremner I wonder if I delete main and master and run "git push --all" if that will set things up.10:13
osse does clone not tell you what the name of the nonexistent ref is?10:14
another| `git symbolic-ref HEAD` on the bare repo10:15
bremner another|: yes, we know that part.10:15
I mentioned it myself about 25 minutes ago...10:15
oh, you mean to read it, sorry10:15
→ otisolsen70 joined10:16
bremner well, I don't have direct shell access, so I can't do that.10:16
osse all you need to do is push the branch that used to be there10:16
what branch was checked out by default when students cloned the repo?10:16
push that one10:16
The End.10:16
bremner well, sure I can tell the student "use master, not main"10:17
osse ?10:17
bremner I have tooling that relies on git clone checking out the default branch10:18
osse if you want to fix the bad thing the student did so that clone works again, do what I said10:18
bremner so, that tooling is broken by this situation.10:18
fsvo "works"10:18
osse if you want to change what the default branch is, you need shell access anyway10:18
bremner sure.10:18
weirdly I can't figure out how they manged to delete the branch. In a test repo "git push --delete origin master" triggers an error10:20
oh well. Too much time invested in this already...10:20
another| something something protected branches10:22
← M6piz7wk[m] left10:33
→ M6piz7wk[m] joined10:34
M6piz7wk[m] → KREYREN10:35
← vladoski left10:36
→ hans_ joined10:37
→ lgc joined10:38
← lgc left10:38
→ tyson2 joined10:47
→ pulse joined10:49
← vishal left10:59
← dante-as left10:59
← dionysus69 left10:59
→ vishal joined11:00
← maret left11:01
→ maret joined11:03
→ zamba joined11:04
zamba i have created a new branch.. and checked it out.. but now i have a file that i want to modify directly on the master and then get these changes replicated to the branch11:05
how do i do that?11:05
git quickly becomes a headache when doing stuff like this :)11:05
ikke Do you have other unrelated changes?11:09
← atrigent left11:10
← maret left11:12
nedbat zamba: Can you say more about why you want to change the file on master and on your branch? Why not change it on your branch and wait for the merge for the change to land on master?11:13
→ atrigent joined11:13
→ lkor joined11:14
← lionkor left11:14
← kevr left11:16
→ n1terr0rs joined11:18
→ maret joined11:18
→ kevr joined11:18
← coot left11:19
zamba well, i guess i'm not using branches correctly.. since i move a bit back and forth11:20
← niterrors left11:22
← YuGiOhJCJ left11:29
→ rgrinberg joined11:32
another| git stash; git switch master; git commit; git rebase master <branch>; git stash pop11:34
← rfuentess left11:35
Foxboron I'd just use worktrees if this happens on a regular basis11:36
I personally also just use git fetch a lot and rebase on `upstream/master`. You can tell rebase to always stash unstaged changes before doing the rebase itself11:37
→ squirrel joined11:38
another| oh?11:38
ikke git rebase --autostash11:38
← LuKaRo_ left11:38
← vyryls left11:38
zamba i don't like the word stash11:39
ikke git config --global alias.stow stash11:40
→ rfuentess joined11:40
→ LuKaRo joined11:42
← rgrinberg left11:42
→ belsirk joined11:44
← rfuentess left11:47
← Jenna16bit left11:47
→ peirik_ joined11:47
→ Jenna16bit joined11:48
rawtaz zamba: how come?11:48
→ n1t3rr0r5 joined11:49
← n1terr0rs left11:51
→ dionysus69 joined11:55
→ nighterrors joined11:55
← n1t3rr0r5 left11:55
← keypusher left12:03
→ keypusher joined12:04
← Visne left12:17
→ ThorMojito joined12:20
← sQVe left12:20
← Aminda[m] left12:20
→ ac0 joined12:26
→ Visne joined12:27
← Alphare left12:34
→ n1ghterr0rs joined12:35
← csm3105 left12:35
← KlungelSmurf9208 left12:36
→ KlungelSmurf9208 joined12:36
← KlungelSmurf9208 left12:37
→ KlungelSmurf9208 joined12:37
← KlungelSmurf9208 left12:37
→ KnoP joined12:37
→ KlungelSmurf9208 joined12:37
← KlungelSmurf9208 left12:37
← nighterrors left12:37
thomas25 text search in all branches?12:38
← n1ghterr0rs left12:39
← thebombzen left12:40
← maret left12:40
→ n1ghterr0rs joined12:41
→ thebombzen joined12:41
← CYKS left12:43
→ CYKS joined12:43
osse thomas25: git grep sometext $(git branch --format='%(refname)')12:45
refname:short looks better12:47
← Jenna16bit left12:48
→ rfuentess__ joined12:48
→ Jenna16bit joined12:49
← belsirk left12:50
→ bloody_ joined12:54
← Cleverness left12:57
→ lucasta joined13:03
→ csm3105 joined13:04
→ nate2 joined13:05
→ rgrinberg joined13:08
← nate2 left13:09
← n1ghterr0rs left13:11
→ n1ghterr0rs joined13:11
← rgrinberg left13:12
← ghost43_ left13:14
→ ghost43 joined13:15
→ vladoski joined13:16
← ghost43 left13:17
← lucasta left13:18
→ lucasta joined13:18
← mz` left13:19
← Murr left13:21
→ ghost43 joined13:21
→ Murr joined13:21
→ Anticom joined13:22
wyre hi guys, may I control whether I keep 'theirs' or 'ours' for a single conflict in the middle of a rebase? (without editing the file directly I mean)13:23
ikke wyre: on file level, or patch level?13:23
s/patch/hunk13:23
wyre ikke, not sure what's a hunk, but ... I'd say on file level13:24
ikke git checkout (--ours|--theirs) <file>13:24
← mobidrop left13:25
osse that will discard also the non-conflicting parts, no?13:26
← hans_ left13:26
ikke it would13:28
← lucasta left13:29
← Xenguy left13:30
wyre ikke, then what about at a hunk level?13:30
ikke Use a mergetool13:31
→ rgrinberg joined13:31
→ lucasta joined13:32
← ThorMojito left13:32
→ ThorMojito1 joined13:32
→ liefer joined13:32
→ dnh joined13:35
← cdown left13:36
bn_work osse: thanks, sorry, didn't see you comment last night. I'm assuming when you said "quote the *", you meant in the `git restore --staged *` command? or the `* text=auto` in the .gitattributes file? Also, is there a way to configure git so it doesn't stage everything like you're saying when it detects a conflict?13:44
s/you/your/13:44
osse bn_work: in the git restore command13:45
as for your second question, I don't know.13:45
→ coot joined13:45
→ gh34 joined13:46
← ghost43 left13:52
→ ghost43 joined13:53
→ hamburgler joined13:53
← atrigent left13:53
→ jdarnley joined13:58
jdarnley Thanks for the @{u} hint the other day13:59
→ cdown joined13:59
jdarnley I just discovered that I can use BRANCH@{u} to get the upstream of the given branch13:59
which is rather wonderful.13:59
→ loulou joined14:00
← loulou left14:00
→ loulou joined14:00
← peirik_ left14:01
← lucasta left14:02
→ rama joined14:03
→ madewokherd joined14:09
← madewokherd` left14:11
← MajorBiscuit left14:16
→ MajorBiscuit joined14:17
→ atrigent joined14:18
← momomo left14:21
← srinidhi left14:22
→ thiago joined14:22
← MajorBiscuit left14:25
→ MajorBiscuit joined14:25
→ lucasta joined14:26
→ Sasazuka joined14:28
← rgrinberg left14:28
→ peirik_ joined14:29
← lucasta left14:34
→ rgrinberg joined14:35
← wgrant left14:36
← rgrinberg left14:39
→ gast0n joined14:46
→ tachoknight joined14:47
← OnkelTem left14:48
→ wgrant joined14:49
→ srinidhi joined14:51
→ mpldr joined14:51
← srinidhi left14:54
→ mz` joined14:56
→ vitali64 joined14:56
← mz` left14:57
← atrigent left14:58
→ mz` joined14:58
← mz` left14:59
→ jazzy joined15:00
→ srinidhi joined15:00
→ mz` joined15:01
← Anticom left15:01
← SuperLag left15:02
→ atrigent joined15:02
← mz` left15:02
← peirik_ left15:02
→ Anticom joined15:04
→ mz` joined15:04
← mz` left15:06
→ mz` joined15:10
← mz` left15:11
→ mz` joined15:12
← mz` left15:12
→ mz` joined15:13
← mz` left15:14
← dmc left15:15
→ mz` joined15:16
← mz` left15:17
→ dmc joined15:17
→ mz` joined15:18
→ rgrinberg joined15:18
← mz` left15:19
→ mz` joined15:21
← mz` left15:22
→ kenanmarasli joined15:22
→ mz` joined15:24
← vladoski left15:24
← mz` left15:26
← rama left15:26
→ rama joined15:27
→ mz` joined15:30
← rama left15:31
← mz` left15:31
→ rama joined15:31
← squirrel left15:37
→ mz` joined15:37
← mz` left15:38
→ mz` joined15:39
← mz` left15:40
← Sasazuka left15:40
→ mz` joined15:41
← rama left15:41
→ rama joined15:42
← mz` left15:42
← csm3105 left15:44
→ mz` joined15:44
→ Sasazuka joined15:44
← mz` left15:45
← LuxuryMode left15:45
← tyson2 left15:47
→ derpydoo joined15:48
← rfuentess__ left15:48
→ mz` joined15:48
← mz` left15:49
→ lionkor joined15:51
→ mz` joined15:51
← lkor left15:52
← mz` left15:52
← RiFo left15:53
→ mz` joined15:54
← mz` left15:54
→ mz` joined15:56
← dnh left15:56
← terminaldweller left15:56
← mz` left15:56
→ mz` joined15:58
← Anticom left15:59
← mz` left16:00
→ Anticom joined16:00
→ SuperLag joined16:02
← Anticom left16:05
→ mz` joined16:06
→ howdoi joined16:06
← Sasazuka left16:06
← mz` left16:07
← zeenk left16:08
→ mz` joined16:08
← mz` left16:09
→ wallabra_ joined16:09
→ mz` joined16:10
→ peirik_ joined16:10
← wallabra left16:11
wallabra_ → wallabra16:11
← mz` left16:13
← jetchisel left16:15
→ mz` joined16:15
← mz` left16:16
← ThorMojito1 left16:17
→ jetchisel joined16:17
→ mz` joined16:18
→ momomo joined16:18
← mz` left16:19
→ mz` joined16:20
← mz` left16:21
→ ghost43_ joined16:24
← ghost43 left16:25
← dionysus69 left16:26
→ skapata joined16:30
← Smith42 left16:33
→ Goddess joined16:35
Goddess im looking for an easy and best way to make my site performance upto 90% is there any tutorial or instructions for it?16:36
→ moldorcoder7 joined16:36
another| 90% of what?16:37
Goddess speed optimization16:37
another| what metric?16:38
Goddess now i dont know what metric is ?16:38
← rgrinberg left16:39
another| are you sure you're in the right channel?16:40
Goddess oops16:40
github?16:41
→ ThorMojito joined16:41
another| no16:42
← atrigent left16:42
Goddess then im on wrong chan lol16:42
→ tyson2 joined16:43
← peirik_ left16:45
← daru left16:45
→ daru_ joined16:45
← MajorBiscuit left16:45
← luckman212 left16:46
← Goddess left16:47
← qwedfg left16:48
→ rgrinberg joined16:48
→ luckman212 joined16:50
→ qwedfg joined16:50
→ dnh joined16:50
← tyson2 left16:52
→ tyson2 joined16:54
← rgrinberg left16:54
→ forgotmynick joined16:54
← qwedfg left16:54
→ phonixgeist joined16:55
→ qwedfg joined16:57
→ pretty_dumm_guy joined16:58
phonixgeist Hi guys!16:59
need some help with git on a Flutter project17:00
→ sgt_chuckles joined17:00
← magic_ninja left17:00
→ magic_ninja joined17:00
← magic_ninja left17:01
← qwedfg left17:01
→ lucasta joined17:01
phonixgeist So, I have an "X" Flutter project. And I created a branch "Y" project. Then while working on "Y" Flutter project added iOS platform support. Flutter created all the necesary files and folders but does folders were created as well at the "X" git. Even if I delete this files from "X", every time a run Flutter those file get created again.17:02
Is there a way to prevent this from happening?17:02
→ magic_ninja joined17:02
← Dragoon left17:03
← lucasta left17:04
phonixgeist but those folders were created...**17:05
→ nate2 joined17:06
→ lucasta joined17:07
→ n1ght3rr0r5 joined17:07
← n1ghterr0rs left17:09
→ qwedfg joined17:10
← nate2 left17:11
→ mz` joined17:13
← derpydoo left17:14
← lucasta left17:15
← sgt_chuckles left17:16
→ peirik_ joined17:19
→ sgt_chuckles joined17:19
← peirik_ left17:23
← furrymcgee left17:24
← MRDPZK left17:26
→ MRDPZK joined17:26
← tyson2 left17:27
← Jenna16bit left17:28
→ lucasta joined17:29
→ Jenna16bit joined17:29
→ Betal joined17:31
→ tyson2 joined17:32
← dob1 left17:36
← vitali64 left17:36
← rama left17:38
→ rama joined17:39
← n1ght3rr0r5 left17:41
← ThorMojito left17:41
→ ThorMojito1 joined17:41
→ n1ght3rr0r5 joined17:42
→ niterrors joined17:43
→ tyson2` joined17:45
← n1ght3rr0r5 left17:46
← pretty_dumm_guy left17:46
← tyson2 left17:47
→ furrymcgee joined17:48
← joto left17:55
→ peirik_ joined17:56
← tyson2` left18:06
→ vdamewood joined18:08
nedbat phonixgeist: this sounds like a Flutter question.18:09
← wallabra left18:10
phonixgeist nedbat, yes I'm asking in both channels because not sure if it is only Flutter or maybe something could be done from Git...18:11
→ wallabra joined18:11
← fflam left18:13
→ rama_ joined18:15
→ zumba_addict joined18:17
→ john_johnk joined18:17
→ dsrt^ joined18:17
← rama left18:17
→ Anticom joined18:20
← rama_ left18:20
← Anticom left18:20
→ rama joined18:20
→ Zaliek joined18:26
→ tyson2 joined18:27
← tyson2 left18:28
→ tyson2 joined18:29
← lionkor left18:30
← peirik_ left18:30
→ lionkor joined18:30
← john_johnk left18:34
← mexen left18:38
→ atrigent joined18:40
← wondiws left18:44
← iomari891 left18:45
← lucasta left18:46
→ OnkelTem joined18:47
← theoceaniscool left18:49
→ wondiws joined18:50
→ Lord_of_Life_ joined18:51
→ chexum_ joined18:52
← chexum left18:52
← Lord_of_Life left18:52
← atrigent left18:52
Lord_of_Life_ → Lord_of_Life18:54
→ n1terr0rs joined18:58
← sgt_chuckles left18:59
← niterrors left19:01
→ junebug joined19:04
→ dob1 joined19:16
← rama left19:17
→ rama joined19:18
→ matni joined19:19
← lechner left19:25
← junebug left19:28
← moldorcoder7 left19:29
← vdamewood left19:29
→ junebug joined19:30
→ vdamewood joined19:30
→ bambanxx joined19:33
→ atrigent joined19:34
→ moldorcoder7 joined19:35
← crabbedhaloablut left19:37
→ crabbedhaloablut joined19:39
← tyson2 left19:40
← liefer left19:41
← manin891 left19:43
→ lechner joined19:45
← m1dnight left19:51
→ ThorMojito joined19:56
← ThorMojito1 left19:56
→ m1dnight joined20:01
← SuperLag left20:04
→ SuperLag joined20:05
← rama left20:10
→ rama joined20:10
← feriman left20:13
→ peirik_ joined20:14
cabazon I started merging changes by hand and I went too far. How can I go back to attempt merging again from scratch?20:14
The merge comes from git rebase master20:14
← igemnace left20:17
← peirik_ left20:19
← chemsmith left20:20
cbreak cabazon: git checkout can do it, via --merge / --conflict=style20:21
→ chemsmith joined20:22
← forgotmynick left20:23
← otisolsen70 left20:24
→ vyryls joined20:26
← dsrt^ left20:44
→ tyson2 joined20:45
→ dsrt^ joined20:45
→ peirik_ joined20:50
← Coop left20:52
→ lucasta joined20:52
← peirik_ left20:54
→ Coop joined21:04
← zumba_addict left21:05
→ peirik_ joined21:07
→ nate2 joined21:08
← bn_work left21:10
← bambanxx left21:11
← peirik_ left21:12
← nate2 left21:13
→ bambanxx joined21:14
← gh34 left21:14
← kenanmarasli left21:15
→ theoceaniscool joined21:16
← junebug left21:17
← Murr left21:20
→ n1t3rr0r5 joined21:20
→ Murr joined21:21
← dnh left21:21
← coot left21:23
← n1terr0rs left21:23
→ hoochmonger joined21:26
→ kexec joined21:31
← rama left21:32
→ rama joined21:32
← tachoknight left21:40
→ peirik_ joined21:46
← rama left21:52
→ rama joined21:52
← carl--- left21:54
← atrigent left21:54
→ ThorMojito1 joined21:59
← ThorMojito left21:59
← Jong left22:03
← lucasta left22:03
← vdamewood left22:04
→ atrigent joined22:05
→ vdamewood joined22:05
← rama left22:08
→ rama joined22:08
← ghost43_ left22:09
→ Cleverness joined22:10
→ ghost43 joined22:11
→ Jong joined22:12
→ nighterrors joined22:17
← n1t3rr0r5 left22:17
← peirik_ left22:18
← nighterrors left22:18
→ nighterrors joined22:19
← FFY00 left22:22
→ FFY00 joined22:22
← bambanxx left22:25
← ThorMojito1 left22:26
← rama left22:26
→ rama joined22:27
→ n1ghterr0rs joined22:30
← atrigent left22:30
→ atrigent joined22:32
← nighterrors left22:32
← Visor left22:33
← n1ghterr0rs left22:34
→ Visor joined22:34
→ tachoknight joined22:34
→ bambanxx joined22:35
→ n1ghterr0rs joined22:35
→ lucasta joined22:36
← xx left22:40
← bambanxx left22:41
← ac0 left22:45
← cdown left22:46
← rama left22:47
← splud left22:47
→ rama joined22:47
→ Oiyqlk joined22:48
← arch_angel left22:49
← kexec left22:50
→ bambanxx joined22:52
← bambanxx left22:55
→ bambanxx joined22:57
← srinidhi left22:58
← bambanxx left22:59
← bindu left23:00
← gas51627 left23:00
→ nominal_value_ joined23:00
← nominal_value_ left23:00
→ nominal_value_ joined23:00
→ bambanxx joined23:00
→ bindu joined23:03
← nominal_value left23:03
← Swahili left23:03
← tachoknight left23:07
→ EternalSunshine joined23:11
→ peirik_ joined23:12
← bambanxx left23:12
→ splud joined23:13
→ bambanxx joined23:13
← theoceaniscool left23:15
→ n1ght3rr0r5 joined23:17
← rama left23:17
→ rama joined23:18
← n1ghterr0rs left23:19
← bambanxx left23:20
← Murr left23:20
→ Murr joined23:20
→ ThorMojito joined23:21
← n1ght3rr0r5 left23:21
← Oiyqlk left23:21
← madewokherd left23:22
→ n1ght3rr0r5 joined23:23
← gast0n left23:23
→ cdown joined23:23
← barometz left23:24
← ThorMojito left23:24
→ Xenguy joined23:26
→ barometz joined23:26
← EternalSunshine left23:27
← lionkor left23:37
→ bambanxx joined23:37
→ forgotmynick joined23:38
← bambanxx left23:39
→ bambanxx joined23:40
← vyryls left23:41
→ cdown_ joined23:48
→ junebug joined23:48
← barometz left23:49
← cdown left23:50
cdown_ → cdown23:50
→ barometz joined23:51
→ Dragoon joined23:54
→ cdown_ joined23:54
← peirik_ left23:55
← barometz left23:56
← cdown left23:56
cdown_ → cdown23:56
← Xenguy left23:57
→ Xenguy joined23:57
→ hans_ joined23:58
→ vyryls joined23:59
← vyryls left23:59

Logs Search ←Prev date Next date→ Channels Documentation