|Forcing merge to accept "new" version from repository [message #783156]
||Wed, 25 January 2012 02:25
| Jouk Jansen
Registered: January 2012
I'm using jgit as a stand-alone application on a OpenVMS system. The filesystem on this machine does not allow files without a "." So when I perform a "jgit clone" files like NEWS become NEWS. So far so good
However these files give a problem when trying
jgit merge "origin/master"
Later and the file NEWS is changed in the repository (and not in the loval copy). I get than messages that there is a conflict.
How can I force jgit to accept the new versions from the repository for these files?
Powered by FUDForum
. Page generated in 0.01658 seconds