home.social

#mergeconflicts — Public Fediverse posts

Live and recent posts from across the Fediverse tagged #mergeconflicts, aggregated by home.social.

  1. Mathias Hasselmann @[email protected] ·

    Waiting for the day when some adds AI to git's merge algorithms to avoid conflicts while cherry-picking, rebasing, merging.

    Well. Do I? Not really.

    #git #AI #MergeConflicts

    #git #ai #mergeconflicts
  2. Jon Fazzaro @[email protected] ·

    "'It was fine before we added your code' doesn't mean that the team merged last did a poor job. This is counterintuitive but worth considering. If the merges had happened in the opposite order, the other team would seem to be at fault."

    #softwareengineering #developerexperience #mergeconflicts #continuousintegration

    industriallogic.com/blog/easy-

    #softwareengineering #developerexperience #mergeconflicts #continuousintegration
  3. agile_otter @[email protected] ·

    Do you experience missed release schedules, flawed releases that must be rolled back, and error reports from customers?

    These are common problems arising from the same underlying cause (at scale).

    buff.ly/6EgA85l

    #mergeConflicts #atScale #branchingStrategies

    #mergeconflicts #atscale #branchingstrategies
  4. data0 @[email protected] ·

    @nobodyinperson @raito

    #Nix support is now ready and has been included in the brand new
    🔀🦒 #Mergiraf v0.6.0 release!

    codeberg.org/mergiraf/mergiraf

    (Mergiraf is a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't.)

    #opensource #coding #programming #cvs #mergeconflicts #git #gitmerge

    #nix #mergiraf #git #merge #opensource #coding
  5. LavX News @[email protected] ·

    Demystifying Git: The Intricacies of 'Ours' and 'Theirs'

    Navigating the complexities of Git can feel like wandering through a maze, especially when it comes to the terms 'ours' and 'theirs'. This article unpacks these concepts, providing clear examples that...

    news.lavx.hu/article/demystify

    #news #tech #GitTerminology #MergeConflicts #VersionControl

    #news #tech #gitterminology #mergeconflicts #versioncontrol
  6. robrich @[email protected] ·

    dzone.com/articles/pre-commit- - #git pre-commit hooks are a great place to check #security, #MergeConflicts, and #lint both #k8s and any #code. Great article Nicolas Giron and Hicham Bouissoumer.

    #git #security #mergeconflicts #lint #k8s #code
  7. Jake Miller @[email protected] ·

    This doesn’t leave us with a solution to our migration conflicts. (#MergeConflicts? 😃) However, as someone celebrating my one-month anniversary, I see a lot of good and well-intentioned people who perceive the technology, communities, and potential of the #Fediverse in different and conflicting ways. I think it’s helpful to think about how we think about it. How to do we think about the Nature, Strategy, and Use of Mastodon, and in which ways do others have different #frames? 12/12

    #mergeconflicts #fediverse #frames
  8. David Cantrell 🏏 @DrHyde ·

    Today my evening will be spoiled by [rolls dice] .

    #git #mergeconflicts