From jpw at coherent-logic.com Sat Sep 19 19:04:03 2020 From: jpw at coherent-logic.com (John P. Willis) Date: Sat, 19 Sep 2020 19:04:03 -0600 (MDT) Subject: [freem-users] Default branch changed from master to main, upcoming CoC developments Message-ID: <598886897.443264.1600563843662.JavaMail.zimbra@coherent-logic.com> Hello, FreeM-sters! - If you do not do any development on FreeM's source code, the easiest option would be to delete and clone the repository afresh.  - If you have made changes to the source code in master (not recommended--you should use your own, private branch), David Wicksell has provided the following list of commands to type in the root of your local FreeM repository:  git checkout main git pull -p git merge master git branch -d master  The FreeM project does not currently have a Code of Conduct, but the development of one will commence in short order. FreeM's CoC would be unique, as--unlike many projects--our core developers do not agree with the notion that meritocracy in software engineering is harmful, and is instead a vital instrument for securing the quality of the project. We wish to hold all contributors to a high standard of relevant, skill-based merit, while simultaneously avoiding gatekeeping around irrelevant factors like age, gender identity, sexual orientation, race, nationality, religious, cultural, and spiritual views, or socioeconomic background, and to stop any bullying or harassment before it would have a chance to start.  I would be delighted to have a conversation with any and all FreeM developers and enthusiasts giving constructive input to the development of such a CoC.  Thank you much, John Willis FreeM Project Lead /* * John P. Willis, CEO * Coherent Logic Development LLC * Solutions: Everywhere * * 425 S. Telshor Blvd. Ste. 202 * Las Cruces, NM 88011 * * Tel: 575.520.9542 * Fax: 575.449.4122 * * jpw at coherent-logic.com * http://www.coherent-logic.com/ * */