Post A7Rzxcwz9szZWKfCAi by flukdipudl@chaos.social
 (DIR) More posts by flukdipudl@chaos.social
 (DIR) Post #A7RxxTcHf60gfCmTnE by mascha@fosstodon.org
       2021-05-20T19:16:24Z
       
       0 likes, 0 repeats
       
       Is there a clever way to get rid of all the `*-lock_BASE_*` and `*-lock-REMOTE_*` and `*.orig*` etc files that emerge while merging things in git? Without removing other untracked files...?I think I'm looking for something like a `git merge --cleanup`
       
 (DIR) Post #A7Rzxcwz9szZWKfCAi by flukdipudl@chaos.social
       2021-05-20T19:38:43Z
       
       0 likes, 0 repeats
       
       @mascha I remember bad times with svn…You may want to have a look at git stash: https://www.git-scm.com/docs/git-stashFor your current problem, you could combine find and rm, but create a backup first :D