Mastodawn

Orlando

@OVargas

2 Followers

22 Following

76 Posts

Software Engineer @ Amazon

Orlando 2d ago

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

Show thread

Orlando May 7

@ktoso you and me both, I’ll be picking that up when it releases.

Orlando Mar 15

@siracusa Which game do you prefer, Marathon or Arc Raiders, now that you’ve played both?

Orlando Jan 26

BasicAppleGuy Jan 25

On this day in 2003, Apple introduced iLife.
For $49, users received a two-disc CD and DVD-ROM set that included iTunes 3, iPhoto 2, iMovie 3, and iDVD 3.