Davyd McColl fluffynuts
fluffynuts
/ daf.omp.json
Last active
April 12, 2021 11:19
My own (rather minimal) oh-my-posh theme (looks best on a terminal with true color)
This file contains 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
| { | |
| "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", | |
| "blocks": [ | |
| { | |
| "type": "prompt", | |
| "alignment": "left", | |
| "segments": [ | |
| { | |
| "type": "time", | |
| "style": "plain", |
fluffynuts
/ attempt-checkin-instead-of-rcheckin.txt
Created
February 9, 2016 09:15
attempt checkin instead of rcheckin
This file contains 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
| C:\code\ix\P4StagingWA_git [master]> git tfs checkin | |
| Working with tfs remote: default => $/P4StagingWA/DEV_Chilli_Projects | |
| Basing from parent 'default:1681', use -i to override | |
| edit .git\~w\Platform5Solution/Assemblies/MessagePlatformProviders/SMSGatewayInterface/GatewayInterface.cs | |
| edit .git\~w\Platform5Solution/Assemblies/MessagePlatformProviders/SMSGatewayInterface/InterfaceModels/GatewayResponse.cs | |
| edit .git\~w\Platform5Solution/Assemblies/iX.Platform5.Communicator.Interface.Test/iX.Platform5.Communicator.Interface.Test.csproj | |
| edit .git\~w\Platform5Solution/Assemblies/iX.Platform5.Communicator.Interface.Test/packages.config | |
| edit .git\~w\Platform5Solution/Assemblies/iX.Platform5.Communicator.Interface/IMessagePlatformProvider.cs | |
| add Platform5Solution/Assemblies/iX.Platform5.Communicator.Interface/IMessagePlatformRecallResult.cs | |
| edit .git\~w\Platform5Solution/Assemblies/iX.Platform5.Communicator.Interface/IMessagePlatformResponse.cs |
fluffynuts
/ attempt-rcheckin-after-pull.txt
Last active
February 9, 2016 09:17
attempt rcheckin after pull
This file contains 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
| C:\code\ix\P4StagingWA_git [master]> git status | |
| On branch master | |
| nothing to commit, working directory clean | |
| C:\code\ix\P4StagingWA_git [master]> git tfs rcheckin | |
| Working with tfs remote: default => $/P4StagingWA/DEV_Chilli_Projects | |
| Basing from parent 'default:1681', use -i to override | |
| Fetching changes from TFS to minimize possibility of late conflict... | |
| error: latest TFS commit should be parent of commits being checked in |
fluffynuts
/ after-pull.txt
Created
February 9, 2016 09:13
after pulling, but before rcheckin attempt...
This file contains 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
| * e725e3f (HEAD -> master) | |
| |\ | |
| | * 8f31dfa (tfs/default) | |
| | * 056c377 (tfs/__Projects) | |
| | |\ | |
| | * \ a513de6 | |
| | |\ \ | |
| | | |/ | |
| | | * 8a40bc0 (tfs/PFW_Bryan_Projects) | |
| | | * ed3f443 |
This file contains 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
| * 157eff8 (HEAD -> master) | |
| * f3db68a (tfs/default) | |
| |\ | |
| | * f0133ad | |
| |/ | |
| * c71fb9b | |
| |\ | |
| | * 85c025c | |
| | |\ | |
| | |/ |
fluffynuts
/ git-graph
Created
February 8, 2016 09:00
graph of my git-tfs state, in an attempt to figure out why rcheckin doesn't work, but checkin does
This file contains 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
| * f3db68a (HEAD -> master, tfs/default) | |
| |\ | |
| | * f0133ad | |
| |/ | |
| * c71fb9b | |
| |\ | |
| | * 85c025c | |
| | |\ | |
| | |/ | |
| |/| |