Suggestions about history management and merge conflicts
Many thanks for this project which was missing and which greatly facilitates the use of sharelatex (if LaTeX is easy to use but this is another discussion.... :p)
I suppose you consider that everything that comes from the sharelatex instance is placed on a branch in advance of the user's local branch. However, I noticed that this causes a systematic merge conflict, so:
- a waste of time, because most of the time the user works alone and just wants to make changes while the remote repository has not been modified.
- many empty commits in the history (at each
git slatex pull
a commit is created even if it is empty)
So here are my questions and suggestions:
-
Could you consider avoiding unnecessary conflicts as much as possible, based on for example, the date of the last modification of the files, or by using the sharelatex history to find out if a modification has been made or not?
-
In the immediate future, the most useful option to save time would be the
-f/--force
implementation to force a push. -
Moreover, it would be great to integrate the changes listed in the sharelatex history into commits with the names of their authors.
Thanks.