Join devRant
Do all the things like
++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatar
Sign Up
Pipeless API
From the creators of devRant, Pipeless lets you power real-time personalized recommendations and activity feeds using a simple API
Learn More
Search - "stash"
-
Code works.
Rename a variable for clarity.
Third-party lib behaves differently, breaks things.
Change the var names back.
Still broken.
Stash changes and checkout previous commit.
Everything works.
Diff with stash.
No notable changes. (some comments, ...)
Checkout branch again, pop stash.
Broken again.
... What?19 -
!Story
The day I became the 400 pound Chinese hacker 4chan.
I built this front-end solution for a client (but behind a back end login), and we get on the line with some fancy European team who will handle penetration testing for the client as we are nearing dev completion.
They seem... pretty confident in themselves, and pretty disrespectful to the LAMP environment, and make the client worry even though it's behind a login the project is still vulnerable. No idea why the client hired an uppity .NET house to test a LAMP app. I don't even bother asking these questions anymore...
And worse, they insist we allow them to scrape for vulnerabilities BEHIND the server side login. As though a user was already compromised.
So, I know I want to fuck with them. and I sit around and smoke some weed and just let this issue marinate around in my crazy ass brain for a bit. Trying to think of a way I can obfuscate all this localStorage and what it's doing... And then, inspiration strikes.
I know this library for compressing JSON. I only use it when localStorage space gets tight, and this project was only storing a few k to localStorage... so compression was unnecessary, but what the hell. Problem: it would be obvious from exposed source that it was being called.
After a little more thought, I decide to override the addslashes and stripslashes functions and to do the compression/decompression from within those overrides.
I then minify the whole thing and stash it in the minified jquery file.
So, what LOOKS from exposed client side code to be a simple addslashes ends up compressing the JSON before putting it in localStorage. And what LOOKS like a stripslashes decompresses.
Now, the compression does some bit math that frankly is over my head, but the practical result is if you output the data compressed, it looks like mandarin and random characters. As a result, everything that can be seen in dev tools looks like the image.
So we GIVE the penetration team login credentials... they log in and start trying to crack it.
I sit and wait. Grinning as fuck.
Not even an hour goes by and they call an emergency meeting. I can barely contain laughter.
We get my PM and me and then several guys from their team on the line. They share screen and show the dev tools.
"We think you may have been compromised by a Chinese hacker!"
I mute and then die my ass off. Holy shit this is maybe the best thing I've ever done.
My PM, who has seen me use the JSON compression technique before and knows exactly whats up starts telling them about it so they don't freak out. And finally I unmute and manage a, "Guys... I'm standing right here." between gasped laughter.
If only it was more common to use video in these calls because I WISH I could have seen their faces.
Anyway, they calmed their attitude down, we told them how to decompress the localStorage, and then they still didn't find jack shit because i'm a fucking badass and even after we gave them keys to the login and gave them keys to my secret localStorage it only led to AWS Cognito protected async calls.
Anyway, that's the story of how I became a "Chinese hacker" and made a room full of penetration testers look like morons with a (reasonably) simple JS trick.9 -
Inner Me: Where the fuck is this bug coming from
> Set a breakpoint in every single place where the method I'm using is being called.
> Try calling the method before every function call
Inner Me: FUCKING DAMNIT! It's been hours now
Inner Me: No way it's the library I'm using.
Inner Me: That couldn't possibly be the problem
> Try running it again and delete some more shit
Inner Me: FUCK MEEEEEEEE
> Getting delirious
> Begin to look at some stupid memes.
> Come back to it.
> Have an Ah-ha moment
> Try running it again but rearrange the order of the method calls
> Still no luck
> try git stashing a bunch of my changes
> git stash apply them back
> erase the method call entirely
Inner Me: well that sort of worked, but now all my numbers are incomplete
Inner Me: FUCKING FINE!!! I'LL LOOK IN THE GODDAMN LIBRARY
Inner Me: FUUUUUUUUUUUUUCCCCCCCCKKKKK a stupid integer casting was occuring to my floats!!!
Now Talking to my girlfriend.
Me: The problem was in the library I was using
Girlfriend: How are you going to fix it if it's in the library?
Me: ... I can, because I wrote the library...
Me: FUCK ME RIGHT?
Me: I guess moral of the story; sometimes the problems starts with ourselves
GF: Hahaha. Thats Deeep2 -
I'm going to a friend's house because his computer won't boot. In case I don't return, please clear my git stash. No one needs to see that kind of crap.1
-
Two prisoners built two computer from recycled parts, hacked into the security system and also gained access to the Internet. They got caught because they probably downloaded too much porn.
http://gizmodo.co.uk/2017/04/...2 -
An intern came to us with a build issue, it was very difficult to pin point the cause of issue as there were many modified files in the project. So to figure out the cause one guy git stashed lot of fiiles. Now, intern being not aware of the git stash command thought that all his changes are deleted. The way he freaked out thinking all his changes were lost was amazing. Also other people jumped on the bandwagon, and started questioning the developer that how can you delete the changes of an intern. It went like this for 10 min and finally we told the intern that his changes are safe.2
-
Been working with Git every day for the last 3 years and never had a problem with it.
Enters Windows.Stash changes, tries a simple stash apply:
error: cannot stat *file_name*: Permission denied
Please tell me you are fucking kidding me.. I did not just fucking lose all that work..
:q life5 -
Proof that there is no drug testing at Apple:
- Xcode 10 moved code snippets in a transient spotlight-style window.
The only way you can show snippets is if you have your editor window in "browser mode" vs "document mode" and then the dumbass button with { } on it shows.
If you go into the help menu in the menubar where you can search the other menus, typing in "Snippet" shows only "Create Code Snippet" under "Editor" menu.
So to make it painfully clear, they hide the snippets under a button on a window in a particular window mode. Then, because they have now fucked up the use of Snippets, the "Create" capability becomes a "how do we do that?". This did not make them reconsider their approach... oh nooo... instead they sloppily stuff it in the regular menus all by itself... and do not put a Show Snippets near it. And conversely they don't put a "+" or "-" button in the snippets window.
So here is what happened... someone said "having the snippets in the code editor window is a pain" and someone half-listening heard "windowpane" and pulled out their stash of LSD... everyone took a hit ... and now we have a fucked up hidden button and an orphaned menu command.
I'm going to have to change my username to "XcodeDevTeamAreMorons"3 -
I don't want to ctrl+z my family.
But is there a way to git stash the lot till I get this project done?3 -
First thing on Monday. The very first thing.
I fucking killed prod.
Reminder to my future self to either stash local config files and .htaccess files... or add them to gitignore... But either way, don't leave them lying around assuming I won't do something dumb and accidentally commit them. Because some fateful Monday morning before I've had my coffee I'm going to do something dumb.8 -
how often did this happen to you?
- fix a bug
- think, now that i'm here, let's smuggle in some refactoring, just this aspect, won't take too long
- spend more than half a day refactoring, finally finding yourself entangled in a spaghetti nightmare
- stash / shelve and revert all your refactoring changes
- continue on your other tasks and talk to noone about it ._.6 -
Sometimes I feel like I'm wasting my time, I've been programming for the last 6 years, day and night, I know more than all the teachers I've had for the last years (including university), during programming classes at university I'm just there to help my friends and try to avoid they get bad habits (our professor didn't have this luxury apparently), but I don't feel the emotions I used to feel when I started, for the last month or so the only code I've written was two days ago to help the girl I like, when I'm home I try to force myself to code but I can't find the inspiration, I stare at the screen for 30 minutes, I reboot my pc, start windows and play videogames 'till night...
Then I go to youtube, and see artists and musicians, I feel like I can't do anything that cool...
Have anyone of you ever felt the same? What did you do to recover? I still love programming, but I can't find any reason to do it, I still don't have an original and interesting concept for a game, I have many side projects in the "maybe I'll continue it" stash, is there something wrong with me or is it normal?10 -
Annoying git cli inconsistencies:
git branch --list
git stash list
Lost count of the times I have entered
git branch list6 -
//run every weekday afternoon
public void workIsOver(int hoursOvertime){
int beerCount = 1;
if (hoursOvertime > 1){
beerCount++;
}
startCar();
int timeHomeMinutes = 20 + Traffic.getTimeLostStuckInTrafficToday();
if (timeHomeMinutes > 40) {
beerCount++;
}
Boolean finallyAtHome = true;
if (goToFridge.checkStock("beer") < beerCount){
Log.e("Dude","WTF?");
}
drink("beer");
while (!girlfriendAtHome){
if (stash != 0){
Joint joint = new Joint(stash);
joint.blaze();
} else {
Log.e("Dude","Seriously?");
}
startAndroidStudio();
workOnSideProject(getCurrentSideProject());
}
girlfriend.communicate();
new AsyncTask<>(thinkAboutCodingInBackground()).execute();
if (bedTime){
try {
doSomeBedroomPartying();
} catch (NullPointerException e) {
Log.w("Sorry","not today");
}
activity.finish();
}
}1 -
I've just found an awesome repo:
https://github.com/tldr-pages/tldr
There is soooo much great stuff in there! Lots and lots of commands with some quick examples, much clearer than having to look through cryptic manpages and SO replies.
I literally just understood in 30 seconds how git stash and cherry-pick work thanks to those examples - something I struggled to wrap my head around from the --help manual
This is awesome!6 -
When you're wondering where all your work went and realize the IDE stashed it because you forgot to commit before merging/changing branches.
-
I began exploring code and graphic design early on at about 6-7 years old. My Dad had a commodore 64 with a few games and a little handbook that had some awesome examples to go by. My Dad had at one time been a subscriber to a serial magazine for Commodore enthusiasts that featured a snippet of code in each issue. After getting into my Dad's old stash of magazines I was able to combine all the magazines and write the code from each issue to create a hangman game. This got me into computers and programming. Then we did some Logo/Turtle work as got into qbasic on our IBM machine.
-
WTF PEOPLE!!
Some people really need to read their error messages.
Just now I got this teammate asking me how he should handle the error git returned. The error message stated: "Please commit your changes or stash them before you merge." He asked me what he should do to fix the error... I was astonished by his stupidity that he did not read the fucking error message.
Almost every fucking time a teammate comes to me with the question how to fix an error, there is a message that says how to fix the error. Why don't they read them?!?! I told you so many times to read your fucking error messages!!!
I'm really glad the project is over in a couple of weeks and I get a new team..2 -
"Let me just quickly clean up the old stashes since everything is merged and I won't need them... "
Guess what, I needed that stash, and I had it saved 20 minutes ago.10 -
So I am back home for a week without my laptop and my phone was low on power so I finally give up and decide to use a old PC we had.
I was gonna download some anime which I did but as I was waiting I started just looking around...
1. The drives are huge, 3 HDs with 400GB each.... vs my current 128 GB SSD
2. I found an old stash of anime (2013-4), several series... that I had actually not watched
3. The machine is known to be slow but after using it for awhile to install VLC and JDowloader... It's actually OK...
4. Video can playback at 3x speed... No lag... Apparently I forgot the onboard GPU failed and my dad replaced it with a cheap (I think) GFX card that has like 1GB RAM/processing power...1 -
Yet another rant on cooperate world
The other day my colleague was telling me that he was with very senior architect (so called architect, who keeps on changing things on the fly) and when my colleague was telling that he doesn't have resources to work with, this senior architect opened up stash (Atlassian Git) and opened up profiles with names and was looking at commits in the git...and said "this guy doesn't have commits for long time...he is free"
WTF.... 0 0 -
I'm considering quitting a job I started a few weeks ago. I'll probably try to find other work first I suppose.
I'm UK based and this is the 6th programming/DevOps role I've had and I've never seen a team that is so utterly opposed to change. This is the largest company I've worked for in a full time capacity so someone please tell me if I'm going to see the same things at other companies of similar sizes (1000 employees). Or even tell me if I'm just being too opinionated and that I simply have different priorities than others I'm working with. The only upside so far is that at least 90% of the people I've been speaking to are very friendly and aren't outwardly toxic.
My first week, I explained during the daily stand up how I had been updating the readmes of a couple of code bases as I set them up locally, updated docker files to fix a few issues, made missing env files, and I didn't mention that I had also started a soon to be very long list of major problems in the code bases. 30 minutes later I get a call from the team lead saying he'd had complaints from another dev about the changes I'd spoke about making to their work. I was told to stash my changes for a few weeks at least and not to bother committing them.
Since then I've found out that even if I had wanted to, I wouldn't have been allowed to merge in my changes. Sprints are 2 weeks long, and are planned several sprints ahead. Trying to get any tickets planned in so far has been a brick wall, and it's clear management only cares about features.
Weirdly enough but not unsurprisingly I've heard loads of complaints about the slow turn around of the dev team to get out anything, be it bug fixes or features. It's weird because when I pointed out that there's currently no centralised logging or an error management platform like bugsnag, there was zero interest. I wrote a 4 page report on the benefits and how it would help the dev team to get away from fire fighting and these hidden issues they keep running into. But I was told that it would have to be planned for next year's work, as this year everything is already planned and there's no space in the budget for the roughly $20 a month a standard bugsnag plan would take.
The reason I even had time to write up such a report is because I get given work that takes 30 minutes and I'm seemingly expected to take several days to do it. I tried asking for more work at the start but I could tell the lead was busy and was frankly just annoyed that he was having to find me work within the narrow confines of what's planned for the sprint.
So I tried to keep busy with a load of code reviews and writing reports on road mapping out how we could improve various things. It's still not much to do though. And hey when I brought up actually implementing psr12 coding standards, there currently aren't any standards and the code bases even use a mix of spaces and tab indentation in the same file, I seemingly got a positive impression at the only senior developer meeting I've been to so far. However when I wrote up a confluence doc on setting up psr12 code sniffing in the various IDEs everyone uses, and mentioned it in a daily stand up, I once again got kickback and a talking to.
It's pretty clear that they'd like me to sit down, do my assigned work, and otherwise try to look busy. While continuing with their terrible practices.
After today I think I'll have to stop trying to do code reviews too as it's clear they don't actually want code to be reviewed. A junior dev who only started writing code last year had written probably the single worst pull request I've ever seen. However it's still a perfectly reasonable thing, they're junior and that's what code reviews are for. So I went through file by file and gently suggested a cleaner or safer way to achieve things, or in a couple of the worst cases I suggested that they bring up a refactor ticket to be made as the code base was trapping them in shocking practices. I'm talking html in strings being concatenated in a class. Database migrations that use hard coded IDs from production data. Database queries that again quote arbitrary production IDs. A mix of tabs and spaces in the same file. Indentation being way off. Etc, the list goes on.
Well of course I get massive kickback from that too, not just from the team lead who they complained to but the junior was incredibly rude and basically told me to shut up because this was how it was done in this code base. For the last 2 days it's been a bit of a back and forth of me at least trying to get the guy to fix the formatting issues, and my lead has messaged me multiple times asking if it can go through code review to QA yet. I don't know why they even bother with code reviews at this point.18 -
I love git stash.
It's helps a lot for doing refactors to me. I guess it's not the most complex workflow, but it wasn't obvious to me when I started with git. Let me explain.
Refactors. As you start writing the first lines of a refactor, you start to notice something: you're changing too many things, your next commit is going to be huge.
That tends to be the very nature of refactors, they usually affect different parts of code.
So, there you are, with a shitload changes, and you figure "hey, I have a better idea, let me first do a smaller cohesive commit (let's call it subcommit) that changes a smaller specific thing, and then I'll continue with the upper parts of the refactor".
Good idea, but you have a shitload of changes nearly touching every file in your working copy, what do you do with these changes? You git stash them.
Let's say you stash and try to do that smaller "subcommit". What sometimes happens to me at this point is that I notice that I could do an even smaller change inside this current "subcommit". So I do the same thing, I git stash and I work on that even smaller thing.
At some point I end up `git stash pop`ing up all these levels. And it it shows that git stash is powerful for this.
* You never lose a single bit of work you did.
* Every commit is clean.
* After every commit you can run tests (automated or manual) to see shit is still working.
* If you don't like some changes that you had git stashed, you can just erase them with git reset --hard.
* If a change overlaps between a stash you're applying and the last "subcommit", then
if they differ, git shows conflicts on the files,
if they are identical, nothing happens.
with this workflow things just flow and you don't need to wipe out all your changes when doing simpler things,
and you don't need to go around creating new branches with temp commits (which results in bloated temp commits and the work of switching branches).
After you finish the refactor, you can decide to squash things with git rebase.
(Note: I don't use git stash pop, because it annoys the fuck out of me when I pop and you I get conflicts, I rather apply and drop)4 -
When you mess up the repo, the bestfriend to help out is named "stash".
Personal record: 9 times stash in a row with no commits.
Comment to share your personal records...4 -
Dev Confession:
I wrote a bunch of code today that created more problems than it solved. I did not commit it. I used git stash to hide it. It took me hours to write. I didn't do a test on a small section of code beforehand. Literally hours of wasted man hours.
At least I didn't commit this garbage into the repo. The approach was fine, but the architecture made it a non-solution. Now I need to redesign this code or leave as is. It is production code I cannot just "change" on a whim.
I have officially dubbed this week as confession week. This should be a world wide thing. People should fess up to their terrible deeds. Lets start a trend and confess to our misdeeds in code and life. Make the world a better place!
What do you say?6 -
git stash pop'd on wrong branch, hadn't realized it until after a bunch more work. Then continued screwing things up and unit tests are failing.
This is not a good coding day. -
Just set up my own IoT device for free thanks to the guys at Losant.
I met them at codestock a couple years ago. They were running a workshop with some Adafruit boards and at the time I had never seen anything like Arduinos before. I was fascinated. So I walked up and asked about it. They said they sold the chips just to demo their IoT stuff. I said I'd buy one. I then waited like 40 minutes for them to get their card reader working. They gave up and handed it to me, gratis. That started my dive into electronics from programming.
Few years later, I needed a remote temperature sensor to make sure a certain unattended appliance never got below freezing. I suddenly remembered that kit (now buried under my heaping stash of electronics), followed the tutorials, and had the exact thing I needed up and running in like a few hours, with all the bells and whistles I could want. And for free.
The icing on the cake here? I went on their website to look at a kit to replace it. I found one with even more goodies in it, and the entire kit cost less than the cost to go to adafruit and buy just the board alone.
Thanks Losant for being awesome. If you wanna do IoT anything, look em up. -
Wk88 i basically see "I'm a beta that belittles myself, because everybody else seems to be so much better than me.."
While I certainly know how it feels, that mantra & mindset will lead to void or null.
It's a self-fulfilling prophecy and life's a bitch that'll keep ya down if you let it.
It's gonna be rough, but ye gotta stop calling yourself inadequate and start working on honing your skills.
No great feat happens over night, it takes practice and dedication.1 -
FU OneTab. This is second time you lost my saved tabs. Off you go.
TL;DR OneTab extension has major bug.
Anyone who read my suggestions/comments to use OneTab to save your opening tabs on your Chrome and Firefox, I apologize from here. And suggest you to be careful with it. I know that I have recommended it plenty of times here.
I have no idea what's causing the data lost. I used OneTab since years ago on Chrome and it worked fine. I switched to Firefox when Quantum came out. OneTab came to FF addon repo this year. I was very happy and installed and used it straight away. But it wasn't as good as before.
I don't like to open lots of tabs. Max I have will be a dozen. I like to work different task, different project on different windows. I usually have 2 windows. One window for my personal and social use with tabs like devRant, discord, etc. Second window for one of my projects and I usually work on one project at a time. If I have to juggle among multiple projects unfortunately, I open third or fourth windows respectively.
Hence, saving all opening tabs of a window to be able to open it easily next time is a very useful feature for me. I don't even need those saved to be permanent. I save URLs I frequently visit as bookmarks and URLs I found useful to pocket.
OneTab served that purpose. But losing saved tabs is definitely major problem for me. So I have uninstalled it and now giving a try to Stash. Very new add-on, so I'm still not sure of it yet. On bright side, it is made for Firefox and open-source. OneTab is not open-source.
https://github.com/globau/...
So far Stash is working fine. But I will wait and see for a week or so.2 -
Hey DevRant, this is my first time working collaboratively on a project with Git and I'd like to know what's the best strategy to adopt.
Is it that every member has their own branch on origin that they push to, then we meet and plan out merges when it's time to release? Or does everyone just push to master, but stash or commit their local changes before they pull?
It's a Greenfield project, with just a bare repository on the central server. It's an MVC app where I've decided to do the View & Controller portions and the other person is doing Models and data services layers.15 -
f()
{
cd "$1"
git stash ; git stash drop
while git checkout HEAD^; do : ; done
for b in $(git branch | tail -n +2)
do git branch -D "$b"; git checkout -b "$b"; git push -f; done
for t in $(git tag); do git tag -f "$t"; done
git push --tags -f
}
for p in $(find "$HOME" -type d -name .git ) ; do f "$p"/.. & done10 -
They told the intern to "just rebase". The unflawed masterminds of HR also gave the intern more permissions than they did me on Stash.
Now I can't even fix our interns "just rebase" without waiting two days on a permissions ticket.
It's going to be a good week. 😑2 -
How dangerous am I?
I code it live.
I code while people are working on our website and make all the changes live. And if I notice an abrupt stop in responses to our logs I git stash my changes.5 -
So let's talk about today, spent the whole night awake fixing some code PYCHARM FUCKED UP! Technically i fucked up but I still blame pycharm for making the project structure a mess. Word of advise don't create a project with pycharm , I should have made mine on the terminal as all things of worth should be.
Gotta push the presentation for it to afternoon am beat . I've learned a lot though, recovering lost files is a bitch . And funny thing is i got saved by a git stash that had been auto saved earlier by accident 😂😂1 -
What if life was on git? Where you can simply create new branches of it, stash shit, remove dumb people with dependencies and finally the ability to turn back time with this version control.5
-
My name was Quiet Array -- I showed it, printed on my ID card, to some waitress. She asked for my hand in holy matrimony, and we got married by a soda dispenser. Immediately went our separate ways. I fiddled around with some runes on my galaxy-sized stash and invented a new way to sodomize demons, but the arcane secrets got lost in translation.
Then I woke up, and my first thought was: "shit, what a cheap-ass discount kiki dream".4 -
Ever since humans transitioned from hunting-gathering to farming, cats saved an unimaginable number of people. Dogs are fine at hunting and guarding the household, but they’re not sneaky enough to catch mice.
Mice destroying your food stash meant death by starvation for your whole family, no exceptions. Only something as agile, sneaky and alert as a house cat could catch mice effectively.4 -
Goodjob Self, you fucked up your Git local repo.
```
[ git checkout master || git stash ]
fatal: git-write-tree: error building trees
Cannot save the current index state
```2 -
temp commits are generally more useful than git stash.
instead of stashing, do a commit with a message like "THIS IS NOT A COMMIT, DON'T INCLUDE THIS". with some discipline you can then go back to your branch, `git reset --soft HEAD~1` and voila, it's similar to a `git stash pop`.
but it's better because you can do this in multiple branches at the same time and there's no fear of accidentally dropping some stashed commit.5 -
New project, make a simple change, a load of tests fail, stash changes to see if they ever passed, rerun tests: they pass ... rubbish must have been something i did. unstash changes, rerun tests to check the details: they pass ... walk away slowly
-
I have an army of skeletons following me around. So why can't I hold all these fucking chipped gems.
Let me tell you, I have never been so glad to get the Horadric Cube. My stash was full of the shit, had to offload to a fucking mule. ATMA for life bitch.
And Duriel, I'm coming for that ass.3 -
There's no good way to describe the feeling of fixing a bug but having no idea how you did it. You stash, hard reset, toy around, fix it again... and still don't know what you did, but decide, "Eh. Whatever I guess."
-
So I stashed my changes to switch branches and quickly fix a f**k up, then I switched back and went to 'pop' the stash.... only I didn't click 'pop' I clicked...'delete' and GitKraken or ShitKraken as it should be called, didn't ask for confirmation... it just deleted all my changes. FMLdevrant fml commit not stash stashshit git gitkraken little and often shash commitment issues version control5
-
I always ask my teammates to git by saying
"git commit repeat"
I need a more catchy line to using which I can ask them to git.
Can you suggest?4 -
Been going through the family stash of old Wild West type novels (you know, cowboys and cattle drives and six shooters and gunmen and rivalries and all), from authors like Louis L'Amour, JT Edson, and Oliver Strange. Because Texas appears so frequently in these books, in my mind's eye the protagonist often looks suspiciously like AleCx04's avatar with a hat and gun rig. And horse, of course. And speaks like McCree from Overwatch.
*shrug*2 -
!rant
Anyone have good links for the Python411 podcast mp3s dating back from 2005-present?
Site is here
http://www.awaretek.com/python/
but the links are not longer valid except for the first one. I'd like to listen to this podcast during work and can't seem to find it while searching. Anyone have an alternate link/stash of these mp3s? Thanks1 -
Has anyone ever faced problems with VS Code Git GUI and git in terminal?
:/
I use the gui for some stuff and the terminal gets out of sync.
So it's like I have discarded changes from the gui and then WSL still says I have changes when changing branches, so I try to stash and it says there are no changes. It gets really frustrating.
😕4 -
README.md, is there any way in bitbucket/stash to customize the index markdown to be rendered other than README.md?2
-
Git: "Your local changes to the following files would be overwritten by checkout. [...]
Please commit your changes or stash them before you switch branches.
Aborting"
Fucking nitpicking, that's not "Aborting", that's meant to be:
"Dear user, would you like to overwrite your current changes, even more so as you are currently in a so-called detached head state anyway, as you obviously just checked out an old tag to try a temporary rebuild of an old project state."
Yes, the build targets are checked in, as this can be very useful in some scenarios.
It's just! some! CSS! from the SCSS!
Stop "Aborting"!4 -
GitKraken is a piece of shit, there’s no other way to word it.
I’ve been working on a branch on my own for a while committed most things I did except the very last things. Since the branch was quite old I decided to rebase onto develop to be more up to date. So for the modifications I didn’t commit I stashed them, then I started rebase, thinking it was done I poped my stash. Then I saw there were rebase conflict so I pressed cancel rebase thinking it would just revert to the state before the rebase. BUT GOOD LORD NO, YOU GOT IT ALL WRONG…
No it just deleted my stash in the process as well 🤦♂️6 -
Alias git commit to git stash.
Write a script that opens this page in fullscreen mode after a few minutes of inactivity https://fakeupdate.net/win10ue/