On 2016-05-03 09:39, Mike Unwalla wrote: Hi Mike,
> But, why was there a merge conflict in the first place? The files that > caused the merge conflicts were not EN. I edit only EN files. I cannot answer that as I've never used the Github Deskop app. But maybe my idea to have you work in your own fork makes everything too complicated. So feel free to clone https://github.com/languagetool-org/languagetool and make your changes there in the master branch (which is the default). You have direct write access but you can probably submit a pull request anyway. Github Desktop might have some way to check your changes before you actually push them. If it doesn't, you might want to install git (not the Desktop version from Github) and run "gitk", which will show a list of changes. Anyway, you cannot really break anything. The worst thing that could happen is that we get changes in the history that we don't want, but that would just be an inconvenience. Regards Daniel ------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z _______________________________________________ Languagetool-devel mailing list Languagetool-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/languagetool-devel
