The basic is either commit or stash, committing WIP is ugly, so stash is preferred:

$ git stash; git pull, git stash pop

Without this you constantly have messages such as:

error: Your local changes to the following files would be overwritten by merge:
	abstract.tex
Please commit your changes or stash them before you merge.
#+end_src sh
However, the problem is that you have to do this all the time, and if
no changes are pending, the stash push will not do anything and pop
will pop the last stashed change, which may be unrelated. A better
solution is to configure git to autostash:
#+begin_src sh
git pull –autostash

Or, better, the permanent configuration:

git config pull.rebase true
git config rebase.autoStash true

However, some conflicts may have been generated. Check the log (especially if scripting/using from an IDE, git does not return an error code for this!).

Many details here: https://stackoverflow.com/a/30209750

git checkout main
git fetch
git diff origin/main
git pull --rebase origin main

https://stackoverflow.com/questions/180272/how-to-preview-git-pull

Don't write whole paragraphs on one line, if there is one comma that is changed in the paragraph by another commit that could trigger a conflict. Diff will be unnecessarily large. Unfortunately (?), diff isn't smart enough to identify character-level changes in a meaningful way, it will mark a conflict for any change on the line. If the line is a whole paragraph that breaks all the time (more frequently as the deadline approaches and many people rush to improve the text!).

• deactivate auto-fill-mode
• make your local configuration to `.dir-locals.el` and add it to .gitignore (could be your local git ignore)
• if a `.dir-locals.el` is committed with global settings, make sure it works for others. In case of need add your own settings to `.dir-locals-2.el`
• use magit
• if other users are using overleaf, it is possible to use git connector to overleaf. There is a plugin to sync with overleaf (kind of works, for example, usage with straight/use-package):

(use-package emacs-overleaf
  :straight
  (emacs-overleaf :host github
	    :repo "Jonghyun-Yun/emacs-overleaf"
	    :branch "master")
    :commands (overleaf-setup)
  )

Add to .dir-locals.el:

((latex-mode . ((eval . (auto-fill-mode 0))
		(eval . (visual-fill-column-mode 1))
		(TeX-master . "main")
		)
	     )
)

This deactivates auto-fill, activates visual-fill-column-mode and sets the main file (for overview C-= , etc). Adapt to the file name.

Seriously, it's a pain to split a paper into 10 files or so, impossible to easily make global changes, etc. With the above things, it's easy to avoid conflicts, and even if there are conflicts it's not such a big deal.

Grammarly helps with writing if Grammarly isn't supported by your editor, you can always make a pass online (like with Github/Gitlab online editor or Overleaf and the Grammarly browser plugin). At EURECOM there is a Grammarly account, search details at https://moodle.eurecom.fr

Justin Zobel , (2014) , "Writing for Computer Science"

and refer to it in case of doubt about writing.

Only proper names are capitalized, and even these can be in lowercase if the name is in common use; for example, the capitals in the phrase “the Extensible Hashing method” should be in lowercase. […] In technical writing it is usual to capitalize names such as “Theorem 3.1”, “Figure 4”, and “Section 11”.

– Zobel et al p128

More importantly, be consistent.

When using "\cite" always glue it to the previous word with a non-breaking space

  blah~\cite{XXX}

Don't make too long sentences. One idea one sentence. Split long sentences and use connection words.

https://github.com/idramalab/latex-101/blob/main/README.md

`wordfeel` and `times new roman` see ~/scripts/templates/wordfeel

ediff works quite well in emacs, but difftastic shows even better the differences. Call with:

GIT_EXTERNAL_DIFF=difft git diff
$ GIT_EXTERNAL_DIFF=difft git show HEAD –ext-diff

View changes from recent commits on the current branch with difftastic:

$ GIT_EXTERNAL_DIFF=difft git log -p --ext-diff

More here: https://difftastic.wilfred.me.uk/git.html

and for emacs/magit integration : https://tsdh.org/posts/2022-08-01-difftastic-diffing-with-magit.HTML