|
Yes, "Allow force pushes" is unchecked now, https://github.com/openjump-gis/openjump/settings/branch_protection_rules/19771186 Michaël envoyé : 15 juin 2021 à 21:29
de : edgar.sol...@web.de
à : OpenJump develop and use <jump-pilot-devel@lists.sourceforge.net>
objet : Re: [JPP-Devel] Sync problem
Did you re-enable it? I especially activated it to prevent force pushing as to not erroneously resetting the main branch! just as an extra security manner. ..ede
On 15.06.2021 21:05, Michaud Michael wrote: Yes, I removed the last commit and forced push. To do so, I had to deactivate a
protection from github which did not allow forced push on the main by default.
Michaël
>> envoyé : 15 juin 2021 à 13:06>> de : edgar.sol...@web.de
>> à : jump-pilot-devel@lists.sourceforge.net
>> objet : Re: [JPP-Devel] Sync problem
>>
>>
>> On 15.06.2021 00:49, Michaud Michael wrote:
>>
>>> Ede,
>>>
>>> I just have had the same problem as a few weeks ago when I pushed some izpack
>>> xml configuration files and other properties file.
>>>
>>> Seems that it happened while I tried to synchronize my fork with upstream
>>> with the github "Fetch upstream" button.
>>>
>>> Anyway, this time, I tried to clean what I did by removing the last erroneous
>>> commit, but it has been a bit tedious, and I'm not sure tha what I did is all
>>> right. Please, double check you don't see anything suspect before your next pull.
>>>
>> hmm, https://github.com/openjump-gis/openjump/commits/main looks clean, no
>> faulty commit on your part. did you force push the main branch? or how did you
>> "clean up"? ..ede
>>
>>
>> _______________________________________________
>> Jump-pilot-devel mailing list
>> Jump-pilot-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
>>
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
|
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
