conflicted (npm): Lets you check whether or not two given branches in your project would produce a conflict when attempting a merge or rebase
Keywords: git|conflict|detect|branch