Personally, I usually just push all of my commits to develop without any cleanup. I don't like changing history in Git, even if it is messy. However, I know many others like to clean up their changes to look nicer. Everyone has their own preferences.
It is possible to "squash" multiple commits together into one commit by using Git's powerful "rebase" feature. Rebasing can be useful when you are working on a separate branch, and want to simplify your changes before merging that branch into develop. Here's an article that I found that seems like a pretty good introduction to rebasing: https://medium.com/@slamflipstrom/a-beginners-guide-to-squashing-commits-with-git-rebase-8185cf6e62ec Be careful when rebasing, though. You nevert want to change any Git history that has already been pushed to develop because that could mess with others who have pulled them already. Rebasing should be used only for commits that don't yet exist on the branch that you intend to merge into. -- Josh Tynjala Bowler Hat LLC <https://bowlerhat.dev> On Mon, Apr 22, 2024 at 3:36 PM Maria Jose Esteve <mjest...@iest.com> wrote: > Hi, I finished the work yesterday (included an update to the > MaterialIconType class as well) and would like to include it in the > repository to move on to something else. > If it's okay, tomorrow morning (in 8 hours), if no one has any objection I > will mix in develop. > > I need you to tell me how you usually make changes to the repo when they > are not simple commits (which we do directly in develop). I created a > branch and made all the changes there. If I merge this branch into develop > all the commits I have made will be pushed. "How do you act in this > situation? How do you usually work against the SDK?" > > Thx. > Hiedra > > -----Mensaje original----- > De: Maria Jose Esteve <mjest...@iest.com> > Enviado el: domingo, 21 de abril de 2024 22:40 > Para: dev@royale.apache.org > Asunto: RE: Align the FontAwesome5Type class with the latest 5x version > > ¿FontAwesome5ProIconType o FontAwesomePro5Type? 😝 > > Hiedra > > -----Mensaje original----- > De: Maria Jose Esteve <mjest...@iest.com> Enviado el: domingo, 21 de > abril de 2024 20:23 > Para: dev@royale.apache.org > Asunto: RE: Align the FontAwesome5Type class with the latest 5x version > > I have completed the FontAwesome5Type class with all the icons from the > latest version 5.x, 5.15.4, Free and I have created the new > FontAwesome6Type class (I made this modification the other day) > > I have followed the following criteria: > - The constants of the new icons for the "numeric digits: 0, 1, 2, ... 9" > begin with "N" (N1, N2, N3...N9) and I have respected the name of the > constants that began by a number, such as "500px", a value corresponding to > the constant "F500PX". > > - The name of a constant matches its value but in capital letters and with > the "hyphens" (-) replaced by "underscore" (_) public static const > ALIGN_JUSTIFY:String = "align-justify"; > > - I have only left the icons from the Free version. > - I have added the icons of the Professional version, which existed in the > FontAwesome5Type class, to the end of the class "temporarily". > > I have obtained the list of icons from the github repositories: version > 5.15.4 [1] and version 6.5.2 [2] I am implementing these changes in an > independent branch [3] until you confirm that it is right or wrong for you. > Next, I'm going to create the FontAwesome5ProType class. > > [1] https://github.com/FortAwesome/Font-Awesome/tree/5.x > [2] https://github.com/FortAwesome/Font-Awesome/tree/6.x > [3] > https://github.com/apache/royale-asjs/tree/fontIcon/toplineup_fontawesome5 > > Hiedra > > -----Mensaje original----- > De: Maria Jose Esteve <mjest...@iest.com> Enviado el: domingo, 21 de > abril de 2024 14:01 > Para: dev@royale.apache.org > Asunto: Align the FontAwesome5Type class with the latest 5x version > > I wanted to ask you a couple of questions... > > I want to align the FontAwesome5Type class with the latest 5x version, > 5.15.4 to complete it (I understand that there will be no more > modifications because version 6x came out) In this class, now, the icons of > the "Free" version are mixed with those of the "Pro" version. > Wouldn't it be better to divide this class into two? leave the Free icons > in the current class and create a new FontAwesome5ProType for the Pro icons? > > On the other hand, I have detected some errors (for now): > area-chart really is chart-area, and the same thing happens with bar-chart > and bar-pie, (chart-bar and chart-pie) My question is... would you modify > the name of the variable as well or leave it as is? > For example: > Now: public static const AREA_CHART:String = "area-chart"; > Opt. 1: public static const AREA_CHART:String = "chart-area"; > Opt. 2: public static const CHART_AREA:String = "chart-area"; > > Option 1 or Option 2? > > Let me know your opinion. > > Hiedra > >
