search

wikicite / bibtag2018

Presentation about WikiCite at the German Librarian Conference 2018
Creative Commons Attribution Share Alike 4.0 International
0 stars 0 forks source link

Resolve merge conflict #6

Closed nichtich closed 6 years ago

nichtich commented 6 years ago

Edits in branch https://github.com/wikicite/bibtag2018/tree/merge-conflict. Git is not that good for parallel working on the same document. I'll try to include my lost changes tomorrow.

zuphilip commented 6 years ago

Let me know whether I can help you with this... BTW the same would happen, when we worked with one Powerpoint file.

zuphilip commented 6 years ago

@nichtich How did you solve this issue? I don't see any recent changes on GitHub...