Helping you solve those tough coding problems!
Learn some great web development and web design tips and techniques through recipes that clearly define the problem being solved with a working solution.
Popular Tags: cakephp | theory | optimization | javascript-development | asp-net | css | jquery-development | sql | ajax | php-development

Search:
Follow @endyourif rss Facebook LinkedIn

Git pull rebase recovery Git pull rebase recovery

Published on Apr 15, 2019 by Jamie Munro

Using git pull --rebase is a great way to avoid those awkward looking commits of Merge branch 'development' of in the list of commits. Very difficult to read the actual deltas. Performing a Git rebase helps solve this. However, from time-to-time I've received conflicts and could not figure out how to fix the rebase and carry on. Scariest moments of my life. Luckily I've been able to recover from this.

Read more >

Tags: git pull | Github | git

Merge one or more Git commits into a different branch Merge one or more Git commits into a different branch

Published on Apr 1, 2019 by Jamie Munro

Problem


You have a commit that you want to move from one branch to the other. This is commonly required when there are additional commits in the branch where your commit is, so you are unable to merge the entire branch.

Solution


Read more >

Tags: Github | git | cherry-pick

Git - Squashing multiple commits into one when merging a branch Git - Squashing multiple commits into one when merging a branch

Published on Mar 3, 2019 by Jamie Munro

When you are using Github, it's quite common to branch your work while working on a feature. Many times your branch contains a lot of small commits that when you merge it into your main branch you want a single commit message describing the full work in that branch.

Git offers a handy command called git merge --squash [your-branch]. This is then a followed by a regular git commit and git push.

Read more >

Tags: Github | git | squash

Cloning or Checking out a repository with GIT Cloning or Checking out a repository with GIT

Published on Feb 15, 2019 by Jamie Munro

You have your own GIT repository or you wish to checkout a copy of a publicly or privately available repository to your computer.

To checkout or as GIT calls it, clone, a repository the git clone command. This command accepts many different arguments. In your command line, type: git help clone for the full supported list.

Read more >

Tags: Github | git | posh-git | git clone

posh-git: the only GIT command line tool I use posh-git: the only GIT command line tool I use

Published on Feb 13, 2019 by Jamie Munro

You've installed GitHub on Windows, but the UI sucks. So you want to use command line, but you want to easily know the state your changes are in at any given moment.

The best command line tool that I use is posh-git. I use Windows for my local development which means I am using the Powershell version of posh-git.

Read more >

Tags: Github | git | posh-git