Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/languagetool-org/language…
Browse files Browse the repository at this point in the history 
…tool
  • Loading branch information
@janschreiber
janschreiber committed Jul 19, 2017
2 parents 84d861a + f10676a commit 51b53df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions ...language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/spelling.txt
View file
Expand Up @@ -13231,3 +13231,5 @@ Zurechnungszeit
zwangsentlassen/A
zweckbefristet/A
Zystektomie/N
Nichtehelichengesetz
Nichtehelichengesetzes
3 changes: 2 additions & 1 deletion languagetool-language-modules/de/src/main/resources/org/languagetool/rules/de/grammar.xml
View file
Expand Up @@ -34700,10 +34700,11 @@ Andere Projekte</example>
<token case_sensitive="yes" regexp="yes">Nicht(deutsch(sprachl|sprech)?|organisiert|berufstätig|behindert)e[nr]?</token>
</antipattern>
<pattern>
<token regexp="yes">nicht(christlich|staatlich|deutsch|leitend|organisiert|rostend|zielend|flektierbar|amtlich|berufstätig|ehelich|öffentlich|kommerziell|behindert|euklidisch|kommunistisch|selb(st)?ständig|linear).*</token>
<token regexp="yes">nicht(christlich|staatlich|deutsch|leitend|organisiert|rostend|zielend|flektierbar|amtlich|berufstätig|ehelich|öffentlich|kommerziell|behindert|euklidisch|kommunistisch|selb(st)?ständig|linear)(e|en|es|em)?</token>
</pattern>
<message>Möchten Sie die vom Duden empfohlene Schreibweise <suggestion><match no="1" regexp_match="(.)icht(.*)" regexp_replace="$1icht $2"/></suggestion> verwenden?</message>
<example correction="nicht rostendem" type="incorrect">Der Träger besteht aus <marker>nichtrostendem</marker> Stahl.</example>
<example>NEhelG – Nichtehelichengesetz</example>
</rule>
</rulegroup>
<rulegroup id="EMPFOHLENE_ZUSAMMENSCHREIBUNG" name="Empfohlene Zusammenschreibung">
Expand Down

8 comments on commit 51b53df

@TiagoSantos81
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jan, you forced a merge requests and they are overwritting commit history.
This one has overwritten everything since 0944685. As you can see by travis results.
Please revert. Before doing that, copy the files you edited to another location, so you don't lose work.
For easy reference use a tool like git-cola DAG to check what happens.

@janschreiber
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I can't do this before tomorrow. I am experiencing this type of problem quite often with [pt] updates. Maybe @danielnaber or some other git guru can help here?

@danielnaber
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand what's going on. A force push should not be possible according to the github settings. @TiagoSantos81 Do you know how to fix the situation? If so, please do. I can have a look tomorrow, but I'm not sure what to do.

@TiagoSantos81
Copy link
Contributor

@TiagoSantos81 TiagoSantos81 commented on 51b53df Jul 19, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know how to fix the situation? If so, please do. I can have a look tomorrow, but I'm not sure what to do.

I have restored my commits, by overwritting a local checkout. In case of your commits, at least b692369 (fixed) needs to be restored. The easy way is to git checkout and copy the file that was not edited.

I'm not sure I understand what's going on. A force push should not be possible according to the github settings.

I don't know how it happened but Travis results show clearly what happened and the DAG tool as well.
It would be great to find a way to avoid this. This is one of the reasons I freaked out with git when I started using it.

I am experiencing this type of problem quite often with [pt] updates.

Not sure what you mean by that. The untested changes were fixed as soon as Travis spit out its results.
Although I have a fork, I do not branch, nor do merge requests.
After my commit # 1 here, an unconsequential mess, I learned and always push with "Fast Forward Only".

This is the first time I notice history re-written here.

@danielnaber
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking care of this, Tiago. I have visited the github setting again and made sure this so-called branch protection is set. It's a rather new setting. Before it existed, one had to email github support and ask for it and that's what I did. Maybe the configuration got lost when they introduced a real setting. @janschreiber I think these issues can be avoided if you use "git pull -r" to get other people's changes. There can still be conflicts, but only if two users actually work in the same file. These conflicts then need to be solved manually before you can push your changes. Anyway, git never needs the --force option, if it asks you for that, something is wrong.

@TiagoSantos81
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have visited the github setting again and made sure this so-called branch protection is set. It's a rather new setting. Before it existed, one had to email github support and ask for it and that's what I did. Maybe the configuration got lost when they introduced a real setting.

@danielnaber I didn't know this was possible, but it is great. Distractions happen all the time, and this could create very difficult to track regressions. Thank you for taking your time with this.

@janschreiber
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for all that hassle. I hope everything is fixed now?

@danielnaber
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think everything should be fine again.

Please sign in to comment.