I created a Go equivalent inhttps://github.com/coder/coder/compare/dk/fix-migs which we could consider moving to.

Cool, I'm not particularly for out against so feel free to PR that work if you want to. Might be best to have a script or make target to shoot having to "go run".

It's a bit simpler (doesn't pull the given branch - trying to be more UNIXy),

We don't pull, just fetch. The fetch has a purpose in that it allows checking the remote, not just your local files. For me that was a big reason to write the script, when I had conflicts I could just run the script and enjoy the magic.

and requires a regex to match a file needing a rename, so it's more dumb but more explicit.

Why dumb it down? When I had conflicts I didn't really want to figure out what I need to do, just wanted the problem solved 😂

We could consider importinglib.sh and verify Bash that way. This is not the only script that requires a more modern Bash I believe.

Hhmm interesting idea. You thinking of usinglib.sh to replace the process with a call to/usr/bin/env bash so that regardless of the shebang we'll get the PATH bash, and on top of that validate a minimum version? Or just the latter?

I'm a bit conflicted re:git mv, I agree it's not elegant but the file being renamed is not guaranteed to be staged, wouldn't that cause issues?

Oof, good point.

We don't pull, just fetch. The fetch has a purpose in that it allows checking the remote, not just your local files. For me that was a big reason to write the script, when I had conflicts I could just run the script and enjoy the magic.

Fair point! I misspoke.

I think let's keep this script instead of the Go one (that took me like 10m with ChatGPT, Mr Snippet himself, doing most of the work 😄). Let's keep thelib.sh changes for a subsequent PR?