• @[email protected]
    link
    fedilink
    887 months ago

    Let the patch be part of the code for one or two minor releases. Then revert the changes of the patch.

    • Victor
      link
      357 months ago

      Why would they do that? Talk about generating mistrust.

        • @jaybone
          link
          57 months ago

          They are going to “accidentally” remove a fix?

          • @[email protected]
            link
            fedilink
            English
            167 months ago

            By not understanding how version control works. I’ve worked at places that had a surprising number of developers who would just merge things in ways that drop code from other developers.

              • @[email protected]
                link
                fedilink
                English
                97 months ago

                It’s pretty straightforward. Merge conflicts? No such thing! Just make my version the next version.

                • @dejected_warp_core
                  link
                  27 months ago

                  Also that’s likely a team that doesn’t use a branching workflow, has poor review on merges, and/or using Git like it’s SVN.

                  • @[email protected]
                    link
                    fedilink
                    English
                    27 months ago

                    How optimistic. At my last workplace I got us to finally stop using zip files for version control. This was at a fortune 500 company.

                    The utility of software is so great that even terrible processes are still functional to some degree.

      • @Sidhean
        link
        07 months ago

        I dunno, but it’d be funny