TLDR:
git rebase --onto newBase oldBase thingToRebase
if you had this:
Monroe Ekilah ekilah
ekilah
/ tsserver-deal-web-5.1.3.log
Last active
October 24, 2023 00:40
TS error logs for https://github.com/microsoft/TypeScript/issues/55673. I added whitespace to `tsconfig.json` at about `17:36:16`
This file has been truncated, but you can view the full file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Info 0 [17:35:36.607] Starting TS Server | |
| Info 1 [17:35:36.607] Version: 5.1.3 | |
| Info 2 [17:35:36.607] Arguments: /Users/monroe/.nvm/versions/node/v16.15.0/bin/node /Applications/WebStorm.app/Contents/plugins/javascript-impl/jsLanguageServicesImpl/js-language-service.js -id=1698107736441 -debug-name=typescript --pluginProbeLocations /Users/monroe/dev/ekilah/deal-web,/Applications/WebStorm.app/Contents/plugins/javascript-impl/jsLanguageServicesImpl/typescript --globalPlugins tsc-ide-plugin | |
| Info 3 [17:35:36.607] Platform: darwin NodeVersion: v16.15.0 CaseSensitive: false | |
| Info 4 [17:35:36.607] ServerMode: undefined hasUnknownServerMode: undefined | |
| Info 5 [17:35:36.614] Binding... | |
| Err 6 [17:35:36.617] Process: Require is used /Users/monroe/dev/ekilah/deal-web/node_modules/typescript/lib/ | |
| Info 7 [17:35:36.638] event: | |
| { | |
| "seq": 0, |
ekilah
/ tsserver.log
Created
October 23, 2023 23:45
TS error logs for https://github.com/microsoft/TypeScript/issues/55673
This file has been truncated, but you can view the full file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Info 0 [16:40:35.653] Starting TS Server | |
| Info 1 [16:40:35.654] Version: 5.2.2 | |
| Info 2 [16:40:35.654] Arguments: /Users/monroe/.nvm/versions/node/v16.15.0/bin/node /Applications/WebStorm.app/Contents/plugins/javascript-impl/jsLanguageServicesImpl/js-language-service.js -id=1698104435420 -debug-name=typescript --pluginProbeLocations /Users/monroe/dev/ekilah/deal-web,/Applications/WebStorm.app/Contents/plugins/javascript-impl/jsLanguageServicesImpl/typescript --globalPlugins tsc-ide-plugin | |
| Info 3 [16:40:35.654] Platform: darwin NodeVersion: v16.15.0 CaseSensitive: false | |
| Info 4 [16:40:35.654] ServerMode: undefined hasUnknownServerMode: undefined | |
| Info 5 [16:40:35.663] Binding... | |
| Err 6 [16:40:35.667] Process: Require is used /Users/monroe/dev/ekilah/deal-web/node_modules/typescript/lib/ | |
| Info 7 [16:40:35.708] event: | |
| { | |
| "seq": 0, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [user] | |
| name = YOUR NAME | |
| email = [email protected] | |
| [color] | |
| ui = auto | |
| [push] | |
| default = simple | |
| [alias] | |
| co = checkout | |
| st = status |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # git prompt start | |
| alias __git_ps1="git branch 2>/dev/null | grep '*' | sed 's/* \(.*\)/(\1)/'" | |
| # Customize BASH PS1 prompt to show current GIT repository and branch. | |
| # by Mike Stewart - http://MediaDoneRight.com | |
| # SETUP CONSTANTS | |
| # Bunch-o-predefined colors. Makes reading code easier than escape sequences. | |
| # I don't remember where I found this. o_O |
ekilah
/ mouse_script.lua
Last active
July 18, 2023 16:11
Logitech Gaming Software Lua script to use a mouse (ie: G502) to toggle leaning in games that don't let you set leaning to a toggle, instead of a hold, in-game
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| -- this script will toggle Q and E with the g502's left (11) and right (10) scroll wheel buttons. | |
| -- that includes disabling one when the other is pressed, and vice versa. | |
| isLeftPressed = false | |
| isRightPressed = false | |
| function OnEvent(event, arg) | |
| --OutputLogMessage("event = %s, arg = %s\n", event, arg); | |
| -- left pressed |
ekilah
/ .gitconfig
Created
August 22, 2016 09:02
Git alias for amending the last commit with all current changes, without having to edit the commit message
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [alias] | |
| amend = !git add . && git commit --amend --no-edit |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| check process lita with pidfile /usr/local/var/run/lita.pid | |
| start program = "/full/path/to/litadaemonscript/litadaemon start" | |
| stop program = "/full/path/to/litadaemonscript/litadaemon stop" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/usr/bin/env ruby | |
| require 'httparty' | |
| require 'json' | |
| require 'ap' | |
| require 'fileutils' | |
| # require 'Date' | |
| API_TOKEN = "FILL THIS IN WITH YOUR API KEY" | |
| BASE_URL = "https://slack.com/api/" |
ekilah
/ admob_workaround.m
Last active
November 4, 2021 19:32
admob video ads seem to use `[MPRemoteCommandCenter sharedCenter]` and `[MPNowPlayingInfoCenter defaultCenter]`, which messes with apps that play music using the same tools. Using Heyzap Mediation, you can attempt to get around this issue using our network callbacks to know when AdMob fetches and finishes, then manually reset things. shared for h…
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| // register for heyzap ad network callbacks as early as you can | |
| [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(admobCallbackNotification:) name:HZMediationNetworkCallbackNotification object:@"admob"]; | |
| - (void) adMobCallbackNotification:(NSNotification *)notif { | |
| NSString *cosnt callback = notif.userInfo[HZNetworkCallbackNameUserInfoKey]; | |
| if ([callback isEqualToString:HZNetworkCallbackAvailable] || [callback isEqualToString:HZNetworkCallbackDismiss]) { |
NewerOlder