Create a new repo in GitHub called “test” and check the checkbox to initialize it with a README.md file.
This repo called “test” will contain a default branch called “master”. On your local machine, this GitHub repo is called “origin” by default because it is the repo you “originally” cloned from. The “master” branch is usually used for production. Together, this repo and branch are referred to as “origin/master” (remote name / branch name).
If you need a separate branch for development, you can create it and call it “develop”. If you create this branch in the “test” repo on GitHub, it will be called “origin/develop”.
In GitHub, get the URL to clone the repo, e.g. https://github.com/javanigus/test.git
On your locale machine, go to a folder where you want this project to exist, e.g. /Users/ayahya/Projects/
cd /Users/ayahya/Projects/
git clone https://github.com/javanigus/test.git
This will create a folder that is the name of the repo, e.g. “test”
cd test
Since it says “master*”, then the files within it are set up to track remote branch “master” from origin.
Using the “ls” command, we see the same, one file (README.md) that is in GitHub.
git log
HEAD is a reference or pointer to the last commit in the currently checked-out branch (master). Notice that origin/master (remote) and origin/develop (remote) and local master and local develop are in sync because they are listed on the same line.
git remote
We see that we only have one remote repo called “origin”.
git checkout develop
Since it says “develop*”, then the files within it are set up to track remote branch “develop” from origin.
git branch
Since there is a * beside “develop” and it is highlighted, the local files are set to track remote branch “develop” from origin.
In this case, I added the text on line 3.
git status
The README.md file has been modified.
git checkout - README.md
git status
The local branch is up to date with origin/develop on GitHub.
git status
git add README.md
or
git add .
git status
git reset HEAD README.md
git status
git add README.md
git commit -m "added one line"
git status
Now, the local “develop” branch is ahead of the remote “develop” branch (origin/develop) by 1 commit. Also, there is nothing else to commit and the working tree is clean.
This shows that local “develop” branch is ahead of local “master” branch, remote “master” and remote “develop” by 1 commit.
We’ll push local branch “develop” to origin/develop on GitHub.
git push origin develop
On GitHub, in the “develop” branch, you’ll see the added line.
Now we see that both local and remote “develop” branches are in sync and ahead of local and remote “master” branches by 1 commit.
git checkout master
The local “master” branch doesn’t have the changes in “develop”. Let’s merge the changes from the local “develop” branch into the local “master” branch.
git merge develop
git status
The local “master” branch is now ahead of the remote “master” branch (origin/master) by 1 commit.
Now we see that local “master”, local “develop”, and remote “develop” are in sync and ahead of remote “master” by 1 commit.
We’ll push local branch “master” to origin/master on GitHub.
git push origin master
git status
The local branch is now up-to-date with origin/master on GitHub.
On GitHub, in the “master” working tree you’ll see the added line.
Now all branches, local and remote, are in sync.
In this case, I added line 4.
git status
We see that our local “master” branch is in sync with remote “master” branch even though we just committed a change in remote “master”.
In order to see what has changed remotely, run git fetch.
Now, we correctly see that our local “master” branch is behind the remote “master” branch (origin/master) by one commit.
git pull
git status
Local and remote “master” branches are in sync again.
Now we see that local and remote “master” branches are ahead of local and remote “develop” by 1 commit.
To see a change in a particular commit, run git diff on the commit, e.g. to see the most recent change (commit 850d7dad8bde14775ea640be860a04c9d061fa41), we run
git diff 850d7dad8bde14775ea640be860a04c9d061fa41~ 850d7dad8bde14775ea640be860a04c9d061fa41
This time I added line 5.
We see that local “master” is behind remote “master” by 1 commit, as expected.
I added line 5
Now we see that local and remote master have each diverged because we didn’t do a pull before committing.
We see a conflict because the change in remote “master” and local “master” was in the same file and on the same line (line 5).
Open the file containing conflicts and edit it.
Since we want to keep both lines, just remove the conflict divider markers.
To mark the conflict as resolved, use “git add” and then check the status.
We see that the conflicts have been fixed but we are still merging.
To avoid having diverged commits and pull conflicts, always do a git pull before committing.
We see that
Now local and remote “master” are in sync and are ahead of local and remote “develop” by 4 commits.
Adding your own music or audio to a video clip is something many people like to do. Fortunately, this is very easy using Corel VideoStudio. Below are steps to add music to a video.
Insert media files, e.g. a video and an audio file
Continue reading Easily Add Music to Video Using Corel VideoStudio
I’ve accumulated quite a bit of tools now to the point that I sometimes forget what I have so I created a personal tool inventory page.
When you’ve got a bunch of images to process, IrfanView makes the process simple and quick. Here’s an example of how to
Open IrfanView and do the following:
So, I’ve been trying to get more out of my music in terms of sound quality and experience. 6 years ago, I thought $30 Sony in-ear earphones were just as good as $200 earphones. Clearly my ears were not trained to know any better. As time went on, I slowly began to notice the difference between quality speakers and crappy ones. I still wanted earphones for their small size and I eventually settled on the BeatsX (bluetooth) which cost $109. The BeatsX are definitely much better than my $30 Sony earphones. Then, as time went on, I noticed that music played in my car sounded better than my BeatsX. One particular experience is the surround sound feeling you get from music in your car. With 6 separate speakers, the sounds from different instruments would appear to come from different directions in a very harmonious way. Since I wanted that experience at home, my research led me to a sound factor called soundstage. The soundstage is a speaker’s or headphone’s ability to add spatiality to the music you’re listening to. Rtings.com explains soundstage in detail and sorts headphones by soundstage. You can see the explanation and ranking at
https://www.rtings.com/headphones/tests/sound-quality/soundstage
With this ranking, I just went down the list and picked the best headphones in my budget. Here are the prices for the top 4 headphones as of this writing:
Continue reading Affordable Hi-Fi Audio Headphone SetupWhen you need to annotate a document and explain certain parts of it, using arrows can be very helpful. If you’re on a Mac, adding arrows, both straight and curvy, is very easy using the Preview application. Here’s how to do it
You can also create straight lines by drawing a line. Preview will detect that you are trying to draw a line and make it straight for you.
Many people dread Ramadan — especially in the US since we don’t get to work half days — because working when you are hungry is challenging and can sometimes give you a literal headache. Every year, I research foods and try to find the right combination of types of food to eat right before fasting each day (around 4 AM). This year, 2018, I believe I’ve come up with a good list. Based on the USDA’s Dietary Reference Intake calculator, I should consume each day
Since we normally eat twice in Ramadan, once in the early morning before beginning your fast and once at night when breaking your fast, we can split these daily values (DV) up, e.g. in half, so that my target for breakfast in the morning would be
Fiber gets processed slowly in your stomach which makes you feel full longer. Protein is an essential source of energy.
So here’s my list:
I like the Simply Balanced Organic to-go cups of oatmeal available at Target. These cups cost $1.49 each and are super convenient to prepare in the morning. Just add water, microwave for 50 seconds, stir, eat, then throw away the cup. There are 3 flavors:
Cranberry
