title: Save versions of Excel file on Git to reconcile differences manually later
body: <p>I will be one month updating Excel files. These files are in a language other than English. I thought I could use Git too to manage what I want to do.</p>
  
  <p><strong>The situation</strong> (the initial commit)</p>
  
  <p>I have an Excel file that is written in the other language.</p>
  
  <p>I have to perform some work and fill an Excel file with data from that.</p>
  
  <p><strong>My plan</strong></p>
  
  <p>After an initial commit, create a branch called <code>toEnglish</code>. Then translate some text on the Excel files to English so that I feel more comfortable. Once I do this I will commit. </p>
  
  <p>Then, the one-month work will start and I will fill the data in the Excel file. I will commit periodically. </p>
  
  <p>After the one month finishes, I will commit, and so I will have the data filled in a Excel page where some labels are in English. </p>
  
  <p>However the output of that one month work has to have those labels in the original language. </p>
  
  <p>So I have a original branch with the original language labels but no data
  and the <code>toEnglish</code> branch with the data but English labels. </p>
  
  <p><strong>The question</strong></p>
  
  <p>I can not merge (fast-forward merge) the branches since that will eliminate the original language labels, so how can I merge in order to produce conflicts (the labels in two different languages) that I will solve one by one so that the final merge will have <em>both</em> the data and the labels in the original language?</p>