Search for a command to run...
I am an iOS Developer from Egypt, Cairo who likes Apple Products and UX studies
I enjoy reading about Entreprenuership and Scrum.
When no one is looking, I like to play around with Figma and build tools/ideas to help me during get things done quickly.
And I keep repeating epic gaming moments over and over again in my head and repeat narratives out loud in my room to regain a glimpse of how it felt when I first saw it (without altering the script)
No comments yet. Be the first to comment.
÷ntroducing Git in this series in a fun, practical and a "Why"-Driven way
And other lazy ways you can take to leave the office earlier
Navigating the Complexities of Domain-Driven Design: Bridging Tech and Business with Clarity and Bounded Contexts
And the start of a Journey with another DDD Book
How Command Pattern can be easily translated to Siri features
Breaking the Chains of Massive View Controllers: Lessons for SwiftUI and Beyond
A New day... a new productive day where my tiny blog gains a new post! https://tenor.com/view/terrific-tuesday-gif-25021333 Today is a bit of a quick one, its about a productivity tip you can imply if you work a lot with terminals, so without furth...
VC (Version Control) in day-to-day life, especially within teams, is a core skill, without it, the whole startup/company may fall down due to 1 small merge issue, and being an excellent VC user is something that instantly makes you more valuable than your peers who don't.
If you ever talk to a great programmer, you'll find they know their tools like an artist knows their paintbrushes.
-Bill Gates
Git it done!
Why Learn this?
Overview
Getting Started
Instructions
Rename Character
Oh No... Typos!
Add New Characters
Improve Story Ending
Merge new character branch into develop
Review the new script and ship it!
Where to go from here?
The team workflow presented here is based on Vincent Driessen's article
"A successful Git branching model"
that introduced the "Git flow" pattern, which is now a best practice used by software engineering teams around the world.
In the course of a team project you are likely to apply the steps outlined
here several times. You should follow this process on real team projects.
Over time, this will make your team more productive while working in parallel.
This image shows the entire process described in the instructions below.
The process likely appears complex at first, but you'll do each step below
one at a time. As you practice this process with teams, you will master it!
For this lesson you will work alone, but imagine you are working
with a group of other developers. Imagine each commit along
the way as being added by a different member of your group.
To start this exercise, set up your repo and code editor:
Script.md file in your code editorthen carefully follow the instructions below step by step.
You are working on the script for a new movie, "The Unicorn King".
You need to fix typos (bugs) in the script, add new characters (features),
resolve merge conflicts and publish (push) the script along the way.
While working on a team, you will create branches to manage team workflow:
You need to have an always working published Production version.
master branch.Your team will be continually iterating on the Development version.
develop branch.Team members will also be developing several New Features in parallel
that may sometimes take a while to complete before they are ready to be
incorporated into the Development version.
feature branches.Movie executives (users) may find typos (bugs) in the Production version
at any time, so you need to be able to fix and publish (push) Hot Fixes
quickly without introducing recent changes from the Development version
that are not ready to be published (tested for Production).
hot-fix or bug-fix branches.At any point you may want to merge one or more of these branches together
to incorporate changes from several different lines of Development.
The first step is to create a new branch you can use
to make small changes to the Development version.
It's important that the changes to this branch are
not visible until they are considered ready to be published.
Your goal: Create a new develop branch and rename the character.
This will be the Development version.
develop branch: git checkout -b developgit add Script.mddevelop: git commit -m "Rename George to ______"
Sometimes your team will need to fix the Production version of a movie script
(product) that has already been published to movie executives (users).
Since you don't want them to see the young boy George's new name just yet,
it's important to fix the typos in the Production version (master branch).
This is a Hot Fix, so you'll need to create a new branch off of master.
Check the current version of the project for typos.
git checkout mastertypo-fixes branch: git checkout -b typo-fixesgit add Script.md && git commit -m "Fix typos"master branch: git checkout mastertypo-fixes branch into master: git merge typo-fixesgit push origin master
These new changes should be incorporated into the Development version.
git checkout developgit merge typo-fixes
Your team will be creating New Features frequently. On larger
teams it's safer to keep this out of the Development version until
the new feature is fully functioning, which may take a long time.
The producers have suggested that adding a zookeeper to the story
would be a good idea. They may change their minds in the future.
Probably best to keep this in a new feature branch.
Create a new zookeeper branch where you can incorporate the zookeeper.
develop branch: git statusgit checkout developgit checkout -b zookeepergit add Script.md && git commit -m "Add Zookeeper"
The word from the movie execs up top is that the plot's conclusion is weak
and reviews will be critical. You'll need to improve the story's ending.
The current ending is already part of the story (product), so your team is
improving something that has already been written (implemented). Therefore,
this work should be done on the Development version (develop branch).
git checkout developgit add Script.md && git commit -m "Improve story ending"
The new character ideas were approved! Be sure to proof read them
before merging them with main story in the Development version.
develop branch: git checkout developzookeeper branch into develop: git merge zookeeper
When releasing a new version of a product, you'll merge the latest Development version (develop branch) into the Production version (master branch).
develop branch: git checkout developgit checkout mastergit merge developgit push origin master
Excellent work! Now you know how to manage a coherent and organized workflow on collaborative team projects with a shared Git repository.