Auto merge upstream changes

[mnacamura]

Going my way! PatrickF1#213

It would be better to automate merging upstream changes.

TODO

• Add github action to do something like this:

git remote add upstream https://github.com/PatrickF1/fzf.fish.git
git fetch upstream main
git checkout upstream/main -- ':!tools' ':!.github/'
fish tools/fzf2sk.fish
git add --all
git commit -m "maintenance: auto merge upstream changes"

[mnacamura]

Hope 5c8612b will work.

[mnacamura]

Committer identity unknown

*** Please tell me who you are.

Run

  git config --global user.email "[email protected]"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident name (for <runner@fv-az213-490.c2vz3wqhpjau3hcstnyptvmwla.cx.internal.cloudapp.net>) not allowed

Fixed in 0682bcf.

[mnacamura]

See the document. Really hope next time it will work!

Run git config user.name mnacamura
From https://github.com/PatrickF1/fzf.fish
 * branch            main       -> FETCH_HEAD
 * [new branch]      main       -> upstream/main
CONFLICT (modify/delete): .github/ISSUE_TEMPLATE/bug_report.md deleted in HEAD and modified in upstream/main.  Version upstream/main of .github/ISSUE_TEMPLATE/bug_report.md left in tree.
Automatic merge failed; fix conflicts and then commit the result.
Error: Process completed with exit code 1.