My name is Dan
A Senior iOS engineer based in the UK who enjoys turning complex problems into clean, scalable products. I’ve led everything from deep modularisation and SwiftUI adoption to CI/CD migrations, always with a strong product mindset. I care a lot about developer experience, accessibility, and building software that’s actually good for people.
Situation: You need to work on multiple tickets but don’t want to duplicate a repository on your computer.
A common situation is that you are either working on task and need to switch to work on another branch or complete another task. Git stashes or just switching branch is possible but sometimes you just want to open another IDE and work in parallel. But you have a problem, you have a slow connection, or large repository and or lack in local storage. What to do.
Situation: You need to get better understanding of what is the relationship between local and remote branches.
I had a very good set of questions from Victoria Park. @VicDevPiano on Twitter regarding workings of local and remote branches and how they relate to each other and what happens during git pull operation. So here are some clarifications.
Situation: You made a commit and later realise you changed a file or files you were not suppose to.
Sometimes after commit is made but before it is merged into master you want to restore a file or a number of files that were not suppose to be changed.
Situation: You made a local commit and want to push your branch to remote but remote tells you not in sync.
There is a situation you have your local and remote branch in sync and you assume that your current change can be committed and pushed to remote. But you get a surprise, your colleague made a commit to your your branch and now your local version is 1 commit behind the remote and you already made a local commit.
Situation: You have some ongoing work but not ready to commit.
How to save work without making commits.
Situation: You done a lot of work but need to merge some remote changes
This is a very common and often dreaded situation. Local changes are all working fine and tests pass but there are remote changes to some of the same files and you are worried things will break.
There are a number of steps to take in order to perform a merge regardless if there are conflicts or not so this post is a bit longer.
Situation: You realise your branch name is wrong and you already made a lot of local commits.
Sometimes you have done some work and committed it locally but not yet pushed it to remote. Then as you are about to push changes you realise you have spelling error on your branch or other naming issue such as task id not matching your Jira ticket.
Situation: You made changes you need to commit to your branch.
Making a commit is similar to saving your current work. It is performed on your local branch with optional push to remote to allow for changes to be visible to other developers.
Situation: You need to start work on a task and need to create new branch.
I often see new and aspiring software developers who jump into field of software engineering from other disciplines find Git to be a scary subject and are afraid of it, with good reasons. Being afraid to break a git repository for a whole team is a good fear to have.
In essence it helps you log messages from your app and help you debug your application. It works across all apple platforms and developers and quality assurance engineers have a dedicated Console app available on every mac to help with the process.
Back to basics of how to add Siri Shortcuts inside your own app using Intents Framework. Focusing on understanding of relationship and setup of intent and “Add To Siri” button.