Re: [Tails-dev] Force pushed stable branch by mistake

2020-05-02 Thread Sandro Knauß
Hi, > The only exception I can think of is our translation platform, but it > only cares about our master branch. I *think* that force-pushing to > our master branch could cause significant trouble there. In the end the weblate scripts do merge commits a lot, as they are aware of two splitted

Re: [Tails-dev] Force pushed stable branch by mistake

2020-04-25 Thread intrigeri
Hi, anonym (2020-04-24): > Also, I wonder if this force-push can have some other consequences > on Jenkins (or other infra). It seems to me that restoring an old > state should do nothing vs our garbage-collection mechanism, for > instance, but I might overlook or not be aware of some > other

[Tails-dev] Force pushed stable branch by mistake

2020-04-24 Thread anonym
Hi! Today I rebased a development branch on stable and proceeded to absentmindedly typed "stable" again when force-pushing: git push -f origin stable I.e. I force-pushed an old state of stable (cf9e208256acc3db931c51cd4df1066452c856c9). Oops! :S Looking at the last job for stable on