Ryan, Thanks.
Yes, I saw +<<<<<<< HEAD. I have gone round in circles trying to deal with the conflicts. To remove the conflict, I copied the content from the languagetool-org repository to my clone of my repository. Then, I added the file for staging and then committed. Then, I pushed the changes to my repository on GitHub. That seemed to solve the problem, but later, merge conflicts reappeared. 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. Mike -----Original Message----- From: Ryan Robertson [mailto:rjr.de...@gmail.com] Sent: 03 May 2016 00:01 To: development discussion for LanguageTool Subject: Re: GitHub Desktop: request for help Hi Mike, You actually sound like you already know more about Git / GitHub than me. I only just started contributing to the project. I don't understand everything that is going on for you. But I have seen cases where a conflict happens during a merge and "stuff" ends up being placed into my code. For example, in languagetool-core/src/test/java/org/languagetool/rules/patterns/PatternTestTools.java, do you see the following? +<<<<<<< HEAD ... +======= ... +>>>>>>> refs/remotes/languagetool-org/master As far as I know, this means there was a problem merging. This has happened to me either when I didn't have the correct tools installed to handle the merge, or I just didn't understand what was happening. In those cases, I had to edit the files manually and then "try again," whatever that means. By the way, thanks for the links. The few pull requests I've submitted were for changes I made in the master branch of my fork. Merge issues notwithstanding, your steps sounds like the better process. On a side note, I don't think you need to reinstall GitHub Desktop. Deleting your repository and creating a new fork should be sufficient to get you a clean copy. I believe there is a way to sync the original (upstream) repo with your fork for keeping up-to-date in the future. Ryan On Mon, May 2, 2016 at 5:21 AM, Mike Unwalla <m...@techscribe.co.uk> wrote: <snip> ------------------------------------------------------------------------------ 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
