If you have worked with GitHub and excel files, then you may have faced this scenario. Let’s say you have two branches, and you want to merge them, but you have a conflict in the excel file. Now excel is a binary file and you can’t know which line it was having issues like text files.
So, a practical option is to keep any of them from one of those branches. Here I am going to discuss the entire process in the video below.