690
Merge conflicts (feddit.nl)
submitted 1 year ago by to c/programmer_humor@programming.dev
59 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 71 points 1 year ago (11 children)

We have a deployed branch. It doesn't get merged into master until it gets reviewed... the technical debt got too big so it never gets reviewed and we just keep branching off deployed

  • permalink
  • fedilink
  • source
  • hideshow 11 child comments
    •
  • [–] 40 points 1 year ago (3 children)

    jesus

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •
  • [–] 30 points 1 year ago (2 children)

    He can't help you. Y'all need Linus.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 5 points 1 year ago (3 children)

    We build off develop and only update master once a year or so. Our company also pays 4 V&V engineers, compared to 9 software devs.

    After a release cycle, we update master. Master has never, never been built by itself.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •
  • [–] 8 points 1 year ago

    Depends on the field you're in. At my previous company to release a new system for internal use only I had to go through 19 validations(each one 50-100 pages of manual tests). None of it had real source control except uploading final zip of files(no source code, just the enable files).

    I wrote all the files, wrote all the test cases, wrote all the documentation, executed everything and wrote most of the reports. They just fired me last week so hope they have fun when they need to update something....

  • permalink
  • fedilink
  • source
  • parent