-
Ship secure high quality software faster.
-
Latest Posts
- Weekly Dev Chat IRL: Advent of Code/Cyber
- SaturdayMP Show 77: Advent of Code 2025 (Day 1 – Part 2: Failure)
- SaturdayMP Show 76: Hack the Box – Lock (Part 2 – Both Flags)
- XPlugins.iOS.BEMCheckBox version 8, 9, and 10 released!
- SaturdayMP Show 75: Hack the Box – Lock (Part 1, Almost Captured the User Flag)
-
Tag! Your it!
.NET .NET Core adventofcode ASP.NET MVC BackAndForth Behemoth Garden BEMCheckBox Birm C# DataGrip Docker Edmonton .NET User Group Entity Framework fun hack the box human resource machine Introduction to ORMs for DBAs ios jekyll kids thinking outside the box Mini-Compressor native-binding NUnit ORM picoctf python react Reduce image size Reduce photo size ruby RubyMine ruby on rails saturdaymp show saturdaympshow security Smaller images software development sql-server standard ruby Takeaways TeamCity Today I Learned xamarin xamarin ios .net native-binding xplugins
-
Archives
Daily Archives: September 22, 2023
Saturday MP Show #13: Merge Conflict when trying to create a PR for the Standard Ruby Linter Bug
I attempted to create a pull request (PR) for the Standard Ruby Linter bug I’ve fixed but ran into a merge conflict. Didn’t create the PR but did figure out the solution to the merge conflict that will be fixed … Continue reading
Posted in Saturday MP Show, Software Development
Tagged GitHub, merge conflict, pull request, saturdaymp show, standard ruby
Comments Off on Saturday MP Show #13: Merge Conflict when trying to create a PR for the Standard Ruby Linter Bug
See you at BSides Edmonton 2023
I am excited to announce that I’ll be attending BSides Edmonton this year! I’m looking forward to increasing my cyber security knowledge from the talks, CTF, and fellow attendees. Specially I’m looking to learn the latest best practices for protecting my clients websites and … Continue reading