I don’t profess to have the fastest hands in the west, however I have noticed I move faster when I do certain things compared with when I do other things. Here are my observations.

The biggest limitation to how much you can get paid is how much you can get…

Pair Programming

I always thought pair programming was a way for junior to be benefitted at the expense of senior developers. It might be the case sometimes. However I now understand multiple other benefits and use cases.

  1. You can understand and start working with Other people’s code faster When you are working…

Build times severely waste productivity. On closer inspection, I realized it wasn’t the build times, it was how I responded to them. I watched youtube videos while I wait for builds to complete or browse the web. That means, I wouldn’t notice anytime the app finishes building, only noticing when…

git status Get a visual of current changes. red changes are unstaged changes. Green changes are staged changes.

git reset Unstage your changes

git checkout .

git checkout -- .

git clean -f -fd -fx

These are the peskiest merge conflicts. After spending days on resolving the same merge conflict, it makes you wonder whether it would be easier to copy and paste files.

Alternatively many people suggest prevention, and that you basically change your daily habits so as to avoid these conflicts. They encourage…

git checkout develop
git pull upstream develop --rebase
git checkout -b yourBranch
git push upstream yourBranch
git branch -u upstream/yourBranch yourBranchgit rebase develop

Before you push

git rebase develop

You should pull the latest develop into your branch before merging, so that you can create a merge commit which will run the latest develop ci functionality in your pr as well.

1. clone the shared repo, in this case: (https://github.com/<Organization>/<project>)

git clone <sharedRepo.git>

If you run

ls

You should see it in your current local directory.

2. create a fork from the shared repo, in this case: (https://github.com/<Organization>/<project>) into your personal github, for example: (https://github.com/<yourName>/<project>)

3. now we make sure the local/cloned repo is pointing correctly.

git remote -v
git remote rename origin upstream
git remote add origin <yourFork.git>

4. Create your local develop tracking branch:

git checkout -b develop upstream/develop

The branch develop must already be in the shared remote, if it isn’t you can add it via github website by first searching for it, and when it isn’t found, an option to add develop will be provided.

5. Create your feature branch and start working:

git checkout -b develop_myFeature upstream/develop

Scott

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store