VeganPizza69 Ⓥ

No gods, no masters.

  • 453 Posts
  • 602 Comments
Joined 1 year ago
cake
Cake day: July 5th, 2023

help-circle

  • Squashing

    The s “squash” command is where we see the true utility of rebase. Squash allows you to specify which commits you want to merge into the previous commits. This is what enables a “clean history.” During rebase playback, Git will execute the specified rebase command for each commit. In the case of squash commits, Git will open your configured text editor and prompt to combine the specified commit messages. This entire process can be visualized as follows:

    Note that the commits modified with a rebase command have a different ID than either of the original commits. Commits marked with pick will have a new ID if the previous commits have been rewritten.

    https://www.atlassian.com/git/tutorials/rewriting-history

    You can also amend for a softer approach, which works better if you don’t push to remote after every commit.

    The git commit --amend command is a convenient way to modify the most recent commit. It lets you combine staged changes with the previous commit instead of creating an entirely new commit. It can also be used to simply edit the previous commit message without changing its snapshot. But, amending does not just alter the most recent commit, it replaces it entirely, meaning the amended commit will be a new entity with its own ref. To Git, it will look like a brand new commit, which is visualized with an asterisk (*) in the diagram below.

    You can keep amending commits and creating more chunky and meaningful ones in an incremental way. Think of it as converting baby steps into an adult step.









  • I think that it’s you who should read more.

    Here:

    Characteristic processes of human evolution caused the Anthropocene and may obstruct its global solutions | Philosophical Transactions of the Royal Society B: Biological Sciences

    We propose that the global environmental crises of the Anthropocene are the outcome of a ratcheting process in long-term human evolution which has favoured groups of increased size and greater environmental exploitation. To explore this hypothesis, we review the changes in the human ecological niche. Evidence indicates the growth of the human niche has been facilitated by group-level cultural traits for environmental control. Following this logic, sustaining the biosphere under intense human use will probably require global cultural traits, including legal and technical systems. We investigate the conditions for the evolution of global cultural traits. We estimate that our species does not exhibit adequate population structure to evolve these traits. Our analysis suggests that characteristic patterns of human group-level cultural evolution created the Anthropocene and will work against global collective solutions to the environmental challenges it poses. We illustrate the implications of this theory with alternative evolutionary paths for humanity. We conclude that our species must alter longstanding patterns of cultural evolution to avoid environmental disaster and escalating between-group competition. We propose an applied research and policy programme with the goal of avoiding these outcomes.

    Figure 2. Dimensions of environmental management create an attractor landscape for long-term human evolution. Environmental sustainability challenges (curved frontiers) require a minimum level of cooperation in a society of a certain minimum spatial size. Alternative potential paths move humanity toward different long-term evolutionary outcomes. In path B, competition between societies over common environmental resources creates cultural selection between groups for increasingly direct competition and conflict. Path A, growing cooperation between societies facilitates the emergence of global cultural traits to preserve shared environmental benefits.












  • You’re referring to outliers.

    If you care about animals, you don’t move to a “desert” where you don’t have a supply of non-animal-based food. That’s the cost of trying to give a shit. You don’t get to be an opportunistic predator, you don’t practice it only when it’s convenient with your business/career plan.

    For most people this isn’t even an issue, but carnists love to glom onto the exceptions as if most humans are living on a space station surrounded by asteroid cattle.