search

ubports / calendar-app

Moved to GitLab
https://gitlab.com/ubports/apps/calendar-app
GNU General Public License v3.0
6 stars 9 forks source link

Update from Weblate. #123

Closed ubports-weblate closed 5 years ago

mardy commented 6 years ago

@Flohack74 for this one, let's please try to accumulate a few merge proposals and then I'll merge them manually in a single commit. I want to see what problems arise, and if we can find a better solution.

Flohack74 commented 6 years ago

No please dont. I can explain you why it wont work: Weblate is always pushing to a single branch here: https://github.com/ubports-weblate/calendar-app and from there makes the PRs. When you squash here, you are actually rewriting history, and then Weblate would need to check out the branch as new. Since it does not do this, upon next push it will conflict. Also it cannot rebase, since it will always try to apply all changes again. Trust me, we have been through this for months, where I was manually fixing tons of conflictgs just for the sake of having a squash. The manual option they suggest is to actually put a git reset somehwere (where?) and then apply it as a rebase. This needs to be scripted manually though, so be my guest ;)

mardy commented 6 years ago

I see. Well, please give me a couple of days to try it out, and then I'll give up forever :-)

Flohack74 commented 6 years ago

LOL now Weblate pulled inside stuff from a merge. This is insane...

bhdouglass commented 5 years ago

@Flohack74 what's the hold up for merging this?

Flohack74 commented 5 years ago

As you can see Weblate has committed also non-translation stuff, and I have no clue hbow it happened. It probably replays commits from another PR? I really have no cluea, thats why I left it open.

bhdouglass commented 5 years ago

Ok, can you or @hummlbach take a look at this and see if we can't resolve it?

Flohack74 commented 5 years ago

Now it looks good!