@OVargas
In case of a #git #mergeConflict I first try rebasing it onto the target branch in #GitLab. If that's not possible, I use #TortoiseGit 🐢 for rebasing. Within 🐢 I then diff all the changes I've made in the remote feature branch and then compare them with a diff between the local feature branch and the remote target branch, which should be the same. Then see if everything locally still builds and if so, rewrite the feature branch.
I just hate merge commits. 🤢
Dealing with a ton of merge conflicts lately, multiple teams keep touching the same files 😅
What tools do you use to resolve git merge conflicts? Are you using something built into your IDE, a standalone diff tool, or just suffering through the CLI Vim like me?
#Git #MergeConflict #SoftwareEngineering #DevTools #OpenSource #Programming #100DaysOfCode
If you've ever spent an hour resolving a merge conflict on a shared branch, you know the feeling of watching this piadina arrive at your table...
From Airport Chaos to Spec Clarity: How Writing Requirements Saved My Sanity
#AI #Coding #SoftwareEngineering #Requirements #Agile #Waterfall #Productivity #SpecKit #GitHub #VSCode #MergeConflict #JamesMontemagno #FrankKruger #DevEx #EntropyReduction
My Microsoft MVP Summit Experience
https://www.jocheojeda.com/2025/04/02/my-microsoft-mvp-summit-experience/
#MicrosoftMVP #MVPSummit #TechConference #DeveloperCommunity #MicrosoftDevelopers #DotNET #Xamarin #MAUI #UnoTeam #Copilot #TechTravel #SeattleTech #TurkishAirlines #DeveloperLife #RayBanMeta #ARGlasses #MergeConflict #DevPodcast @jjcolumbie @unoplatform #MVPBuzz #MVPSummit, #MVPSummit2025
A group of wolves is called a pack.
A group of crows is called a murder.
A group of developers is called a merge conflict.
#dev #developer #devhumour #group #mergeconflict #humour #funfact
What happens if you lose your Android Keystore? Do you ever get to publish you app again? We find out!
It has been several months since we got our Mac mini M4 Pro. What are our thoughts on hardware, software, and real world development.
We are going "live" from our houses to CES and picking out some of our favorite finds from the week.
With the holidays behind us, we reflect on Frank's "fun" time playing IoT tech support and talk about the state of multiple houses and managing family tech devices.
Xero Slingsby
Orlando
Rubycon Italy
Joche Ojeda
MaikeCoon
James Montemagno