I wish I could give you an explanation why non EN files were edited. All I
know is that I see them in one of your commits, hence the merge conflict.
Did you notice that some non EN files were edited before you committed
those changes to your repo?
As best I remember, this was the sequence:
1. I could not discard changes in GitHub Desktop. (I cannot remember the
message that GitHub Desktop gave, all I know is that I wanted to discard
changes.)
2. Because I did not find an answer using my favourite search engine, I
contacted GitHub
.gitattributes was added by GitHub Desktop during the setup process. So, I just
accepted what GitHub Desktop recommended.
Yes, line endings cause problems, specially when working cross-platorm. Refer
to 'Formatting and Whitespace' in
Hi Daniel,
I accepted Ryan's clean-up. For now, I will continue to work with my fork.
> you might want to install git (not the Desktop version from Github) and
run "gitk"
GitHub Desktop comes with Git. A nice feature is that the software updates
automatically, so I will always have the most
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
@Mike, to be honest, I suspect it may have had something to do with the
.gitattributes files you checked into your repo. (But I don't really know
for sure since I'm new to working with git.) Line ending normalization
sounds like something that would change files without you actually editing
@Mike, looks like I was wrong about the .gitattributes file. :)
Last night (for me) I had the same experience of not being able to discard
from GitHub Desktop. Now I know it's caused by files that have failed to
merge!
The way I handled the merge conflicts in your repo was to use notepad++ to
