Updated with some related commits to avoid clashes. Requested by Elin on the tracker.

@Bakual This isn't mergable at the moment, can you update your branch?

@elinw My problem is that I don't have figured out yet how to properly update a branch without creating a ton of commits.
Do you know why it isn't mergable? Is there a specific commit which has conflicts?

@elinw I'm a bit lost. I've figured out that there are conflicts in the SQL files (update and install) because we both changed stuff in it. But I have no clue how I could solve it in my PR. I guess the conflicts needs to manually be solved when merging? But then I'm really not that familiar with git, so maybe someone can share some insights how I could help solve the issue.

I think what happened is that instead of merging the updates from master into your branch, it looks like you committed two commits from master on top of your branch, further separating your branch from master and causing more conflicts.

Git can be a bit touchy, but once you understand it, you learn to either accept its quirks or improve your workflow (at least that's how it's gone with me).

That's possible, I just tried to do what was requested on the tracker.
Is there a way I can fix this now without creating a whole new PR with my (quite simple) changes?
Merging from master into my branch resulted in a lot of commits the last time I tried it. I think I probably did it wrong.
I'm using SmartGit to avoid the command line and used the "Rebase" function which sounded appropriate but wasn't :)

Merged the PR from Elin against my branch (sorry for the delay, didn't see it). Hopefully that worked.

Since this one still isn't mergable (think I messed it up again) I created a new one. Same stuff but from an updated branch and should be mergable now. See #1398.
Closing this one.