Dalin Oluoch dcDalin

Merge conflicts

Happens when working on a team project when two/more developers have edited the same file.
Therefore, face the conflict courageously.

Assumption: current_branch(local branch) conflicts with a base branch called base-branch

git pull origin --rebase base-branch. If your local base-branch is upto date with origin, you can just do git rebase base-branch If merge conflicts persist:
Fix merge conflicts by accepting either current changes, incoming changes or Accept both changes. Remember to cosult when fixing conflicts because you might end up removing crucial code.

Set up project:

mkdir project
cd project
npm init -y

This means, on your local machine, you haven't made any SSH keys. Not to worry. Here's how to fix:

Open git bash (Use the Windows search. To find it, type "git bash") or the Mac Terminal. Pro Tip: You can use any *nix based command prompt (but not the default Windows Command Prompt!)
Type cd ~/.ssh. This will take you to the root directory for Git (Likely C:\Users\[YOUR-USER-NAME]\.ssh\ on Windows)
Within the .ssh folder, there should be these two files: id_rsa and id_rsa.pub. These are the files that tell your computer how to communicate with GitHub, BitBucket, or any other Git based service. Type ls to see a directory listing. If those two files don't show up, proceed to the next step. NOTE: Your SSH keys must be named id_rsa and id_rsa.pub in order for Git, GitHub, and BitBucket to recognize them by default.
To create the SSH keys, type ssh-keygen -t rsa -C "[email protected]". Th

	/*
	JavaScript
	Write a mySort function which takes in an array integers, and should return an array of the inputed integers sorted such that the odd numbers come first and even numbers come last.

	For exampl1e:

	mySort( [90, 45, 66, 'bye', 100.5] )
	should return

	[45, 66, 90, 100]