-
Ship secure high quality software faster.
-
Latest Posts
- 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)
- SaturdayMP Show 74: Migrate From Rails to Jekyll (Part 7 or 7)
-
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
Tag Archives: merge conflict
Saturday MP Show #15: PR Created for Standard Ruby Linter Bug
I finally create the PR for Standard Ruby Linter Bug I’ve been working on the base several videos and months. I also fix the merge conflict noticed in the previous video. Read about the bug I’m trying to fix here … 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 #15: PR Created for Standard Ruby Linter Bug
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