Back to LanguageTool Homepage - Privacy - Imprint

Mistake created?

(Ruud Baars) #1

Somehow, something was updated in an action of mine, which was unintentional. I don’t even understand what caused it.
It was marked on github as :
baarsrj Merge remote-tracking branch ‘origin/master’

But nothing was done by me in those files. Git is too stiff for me.

(Daniel Naber) #2

Git will automatically create “merge commits” if needed. This can (and should) be prevented by using git pull -r on the command line instead of just git pull. If you’re using a GUI instead of the command line, there should be an option somewhere called something like “rebase updates”. In IntelliJ IDEA: from the main menu, you can choose VCS -> Update Project. In the resulting dialog, you can set the “Update Type” to Rebase (I found this on the web, I use the command line myself).