js-beautify JSの整形をCLIでできる。pip install js-beautify

git-merge allow-unrelated-histories --allow-unrelated-histories オプションを見てみる By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging…