`pull` conflicts for some fast-forward changes
As reported by @pvignet in #18 (closed):
Indeed, I also have difficulties in reproducing the problem, which is not in fact systematic; so I thought I had a dream > when I wanted to reproduce it. However, I managed to reproduce the bug without having (yet) identified its origin:
Ex: I make a modification (among others) on my local file: I replace the following line:
\newcommand{\reactome}[1]{\textcolor{blue}{#1}}
by:
\newcommand{\reactome}[1]{\textcolor{green}{#1}}
The original line remains on Sharelatex:
\newcommand{\reactome}[1]{\textcolor{blue}{#1}}
Here is my diff before doing the commit obtained by
git diff
:-\newcommand{\reactome}[1]{\textcolor{blue}{#1}} +\newcommand{\reactome}[1]{\textcolor{green}{#1}}
Also obtained after making the commit:
$ git diff 786324113b619a348fa27dea1b076ffd7b09d717 5b4e4b63e547dd76629fd93fe354efbf0f772bd9 -\newcommand{\reactome}[1]{\textcolor{blue}{#1}} +\newcommand{\reactome}[1]{\textcolor{green}{#1}}
And via
git log --stat
:commit 5b4e4b63e547dd76629fd93fe354efbf0f772bd9 Author: XXXX Date: Wed Oct 23 20:43:43:30 2019 +0200 Fix typos, add doc for Table:databases_interpreted_data main.tex | 23 +++++++++++++++++++++++++------ 1 file changed, 17 insertions (+), 6 deletions (-) commit 786324113b619a348fa27dea1b076ffd7b09d717 Author: XXXX Date: Wed Oct 23 18:35:15 2019 +0200
The repository is now clean, so I do
git slatex push
:CONFLICT (content): Merge conflict in main.tex Automatic merge failed; fix conflicts and then commit the result.
Verification of the conflict:
$ git diff diff --cc main.tex index fc982d4,712dd89...0000000 mode 100644,100644...100755 --- a/main.tex ++++ b/main.tex @@@ -41,7 -41,7 +41,11 @@@ \newcommand{\highlight}[1]{\colorbox{yellow}{#1}} ++<<<<<<<<<<< HEAD +\newcommand{\reactome}[1]{\textcolor{green}{#1}} ++======= + \newcommand{\reactome}[1]{\textcolor{blue}{#1}} ++>>>>>>>>>>>> __remote__sharelatex__ % blah blah blah blah blah
Since Sharelatex has not been modified (at least not on this line, I am 100% sure); I think that the merge should have been a simple update with the type
Fast-forward
on the master branch?