hit setup exe In the license window, MAKE SURE that you check that you will be using this for non-commercial use so that you get the product for free (a small white lie).
If SmartGit asks for your private key, it should be in C:\Users\<your username>\.ssh\ check 'Remote Git, Mercurial or SVN repo' radio button and enter this address https://[email protected]/sdsol- tech/git_training You should be prompted for your Github password and then asked to specify a LOCAL directory in which to store your project you are then asked to name your project, you should give it the same name as the repo, in our case 'git_training'
in our project. 2. stage the edits so that Git knows the changes exist. 3. commit the files. 4. pull from the master Github branch in case any of our teammates have made changes. 5. merge conflicts if any have occurred. 6. push our changes to the remote Master on Github.
git_training/ go to git_training/public/index.html, make a change, and save the edited file. now in SmartGit, switch to the 'Review' tab at the upper right. In the files window, you'll see that 'index.html' has been modified.
committed, and ready to be pushed, BUT do not push to Github yet. Hit 'Pull' at the upper left corner to sync your local master with the remote master If no one has worked on the exact same files that you've worked on, then the pull will go through, if not, then there's a conflict, we'll discuss those later
the project, let Git know about your changes, committed your changes, and updated your local repo in case anyone has worked on the project in the time that you cloned, it's time to push. On the upper left hit 'Push' and you'll see output like this... you should now see your changes on Github
same time that Shafiq works on index.html? If Shafiq commits and pushes first, when I go to sync my local master by pulling, my pull will be rejected...
and your local master is updated. Git will display conflicts like this... everything in between <<<<HEAD and ===== is your local change, between ===== and >>>>Origin/Master is what's on Github - the remote master.
Your Podcast. Everywhere. Effortlessly.
leveton
rocio
bcantrill
holman
rkendrick25
techseoconnect
ryanjones
pauljervisheath
sabderemane
addyosmani
lara
lauravandoore
tammyeverts
![That's it Please contact me at [email protected] if you have](https://files.speakerdeck.com/presentations/4fb06de1779aa0001f00f745/slide_17.jpg){kind=link}