[dokuwiki] git question
- From: Michiel Dethmers <michiel-dokuwiki@xxxxxxxxxxx>
- To: dokuwiki@xxxxxxxxxxxxx
- Date: Sun, 21 Apr 2013 14:17:55 -0300
hi list
I forked dokuwiki on github, and was trying to update my master with the
latest upstream.
git fetch upstream
git merge upstream/master
but I get loads of conflicts, mostly in the zh-tw translations.
As my chinese is non-existent, I have no idea how to resolve the conflicts.
Questions are:
1. why are there conflicts? I didn't touch those files.
2. is my only option to re-fork?
Thanks
Michiel
--
DokuWiki mailing list - more info at
http://www.dokuwiki.org/mailinglist
Other related posts:
- » [dokuwiki] git question - Michiel Dethmers
