I posted this on stack overflow
but I thought it would be relevant to ask here too. I copy and paste
I am hoping I have a simple question for you, but I can't find an answer
anywhere (I have been searching for 2 days, maybe I am dumb?). I am trying
to develop a git workflow to collaboratively edit LaTeX files with my PhD
adviser. The problem we face is due to the behavior of git merge (because
it merges automagically). I want git to conflict anytime it sees a file
change, even if it is an addition, subtraction, or minuscule change, is
this possible? This way we can both pick and choose changes and continually
push to master.
I am not opposed to using another tool, but I would prefer not to create a
complicated branching system. I assume branching is unnecessary when 2-3
people are working on the same file. Thank you so much for your help!
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.