print all conflicts in the current channel

Add .ignore file that ignores common files

Created by  ryanbooker  on April 5, 2024
TEIPIE7JYQK6MX4TGZ7IMFEIE276YQSFP53VNOAHX2VDPCUIGWSAC
Change contents