stash | StaSh - Shell for Pythonista | Command Line Interface library

I currently have two copies of the same Git project checked out on my machine. I'm aware that traditionally one would not do that; it's more typical to have the project checked out once and switch branches as needed. The primary reason I have the second copy so that I can review merge requests locally — within my IDE, as well as by running the code — without having to context switch out of whatever work I might be in the middle of. That work might not be in a state where it's convenient for me to stash, or commit, or stop running a long running process.

I accidentally made some changes to the wrong copy of my project locally, and want to move them to the correct copy.

I know that I can create a branch, push them to the server, check them out on the other branch, and then delete the remote branch. This isn't too terribly onerous.

On stash we can do commits?until=commithash to show all commits before a specific commit, but is there a way we do the same on Github website?

My CI/CD on gitlab deploy code on heroku using dpl. It have been working like a charm until a new version of faraday (I guess it is the reason) is fetch.

Here is what I had in my gitlab CI terminal when it worked (yesterday) :

I have created a kdb file in my IBMMQ (docker) using below command:

For example, I start from a clean commit, make some changes to different files, then I want to remove changes I made from only one file. How do I do it?
I tried to do:

I got this ! sign next to my file name right after I resolved a merge conflict after running git stash pop. Does anyone know what it means and how to remove it?

In my project, we have about 700,000 source files. I'd call it a larger project.

When I am working on fixing a bug or implementing a feature, I will quite frequently end up with many files that I have made ancillary edits. Such as debugging instrumentation, or alternative implementation, or an expensive check for a never-happen situation that once appears to have happened in the wild and I want to catch it if it ever happens on my machine, or clang-format because the original had goofy formatting.

To commit my good changes, I'll branch, I carefully add the relevant files and commit those. (Followed by a push of my changes. Make a PR. Get code review approval. Jenkins builds on all the dozen different target platforms, and runs the test suite. Then I merge my branch into main.)

Probably a fairly typical workflow... except for that I have many (1000+) not-for-check-in files that I want to keep modified in my worktree, but not merge those into main. That latter part is probably atypical.

With Perforce, I would add my not-for-check-in files into a not-for-check-in changelist and park them there. They'd be out of the way, and I could not accidentally pull one of those "tainted" files without taking steps to move it out of the not-for-check-in changelist.

So far, my git tactic of being super-duper careful has worked, but seems fraught with peril. I maintain a stash.txt file that has a list of my not-for-check-in files, and frequently stash them to temporarily get them out of the way, do my git things (making branches, fetch, merge, push, whatever), and stash pop them back in my worktree. Seems janky, manual, and error prone; high cognitive load. Has to be a better way.

(I have not run into the scenario when I have a single file that has both good changes and not-for-check-in changes. If/when I do, I am aware of how to add-and-commit hunks of changes.)

I have tried the tactic of making a branch, add-and-commit both my good changes and not-for-check-in changes. Then cherry pick the good changes for what should go into main. That scales poorly with the 1000s of not-for-check-in files that need to be sifted through.

Any advice or guidance is appreciated.

Hi I am working on a new project that I just cloned, any changes that I make in the files are creating new files in .history/, these files are untracked and as they are made with every there is quite a lot of them. When I just make changes in existing files its a bit easier to commit, as I don't have to add them to it and after the commit a I can stash them all. But it is not really how I wanna work and I see that once I will need to add a new file this will be even more annoying. I work in VS Code but in any other project the git flow works fine so I think it does not have to do anything with that. Doea anyone know how to avoid creating these files by git? Thanks

Need to gather a list of the subroutines that the current package itself declares - no imports.
I've seen Package::Stash, but it lists imported names (of course).

Came up with the following, but I don't like having to move the includes to the bottom of the file.

Anyone see how I can gather the same list, but still keep my includes near the top ?