Git Notes

-
Just Enough to Get Started with Git and Github

Given a project started locally outside of Git. Move it to git and github:

  https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/

Workflow:

  git status
  git add foo
  git commit -m "fooooooooooo"
  git push origin master


Next, a One-Person Workflow with Branching

#Start with a project in a happy, committed state
#Master is our main/production branch

#Create a branch to work on a new feature
#git checkout -b <new_branch> <start_point>
    git checkout -b new-feature master

#The above is the same as
#   git branch new-feature
#   git checkout new-feature

#See all the branches
    git branch

#Push the new branch to Github. After this, "git push" will update everything.
    git push --set-upstream origin new-feature

<Do stuff & commit.>

#Store your commit safely on Github
    git push

<Rinse and repeat>

#Merge your beautiful new work
    git checkout master
    git merge new-feature
    git push

#Delete the feature branch
    git branch -d feature-branch

#Not sure if this matters. The feature branch is still listed on Github
    git push


Next, Work with Other Humans...
...

Comments

  1. Jim KarnoppJuly 12, 2018 at 8:36 PM

    Here is the workflow I have been using:

    Start by creating a new repository on GitHub.

    1. Create and initialize the local project and push to GitHub

    echo "# [Project Name]" >> README.md
    git init
    git add README.md or git add . //to add all files
    git commit -m "first commit"
    git remote add origin https://github.com/[username]/[Project Name].git
    git remote -v
    git push -u origin master

    2. Feature Branch Workflow
    start with master branch

    git checkout master
    git fetch origin
    git reset --hard origin/master
    Create new Branch

    git checkout -b new-feature master

    3. Do some work

    git status
    git add
    git commit

    4. Initialize the upstream branch the -u only needs to be done once

    git push -u origin new-feature

    5. do some more work then add to the remote

    git push

    6. initiate a pull request at github

    http://www.github.com/[UserName]/[Project Name]

    7. once all changes have been approved, merge the branch.

    git checkout master
    git pull
    git merge --no-ff new-feature
    git push origin master

    8. Start this process again for the next feature.

    ReplyDelete

Post a Comment

Popular posts from this blog

Callback, Promise, Observable, and Doughnuts

-
This is the story of Jerry JavaSript's Automated Slow Doughnut Shop. One day, I wanted a doughnut. So I rode my bike to the automated slow doughnut shop, where they have a slow doughnut machine. You put in a dollar. And then the machine mixes batter, heats the fat, drops the batter into the fat, lifts it out on a linked metal conveyor belt, dusts it with sugar, and drops it into your waiting hands. Once I get my doughnut, I can eat it in the usual manner. But from the time I put in my dollar until the time I receive my doughnut, I am blocked. Fortunately, the slow doughnut machine has a slot labeled, "Insert callback  here". This is great. I code up a function eatDoughnut(doughnut) . I can reference my teeth,  esophagus, stomach, and so on, because they are mine and I know all about them. And then I slip my   eatDoughnut(doughnut)  function  into the slot and get on my bike and ride  to the office while the slow doughnut machine is still mixing batter. When the
Read more

Learn grid and grid-template-areas FIRST!!!

-
If you're starting to learn web design, you will see hundreds of tutorials about floats clear-fix and positioning and other infinitely painful details on how to actually get HTML and CSS to lay things out in seemingly normal and obvious ways. You'll probably have to learn some of that. But don't learn it first! Instead , read this  https://developer.mozilla.org/en-US/docs/Learn/CSS/CSS_layout/Grids And then read this  https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-areas and a longer tutorial here  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout/Grid_Template_Areas Then lay out your web pages as if layout was something we were actually allowed to do. (And then go back and learn some of the painful stuff later. Or if enough time has passed, maybe you won't have to.)
Read more

The Day TDD Started Working for Me

-
I've always agreed that Test Driven Development was a good idea and I should be doing it. But it's hard to do on top of learning new tools. And it's hard to do for GUIs. So it never quite happened. However, after I worked with React and Redux a bit, and after doing a couple hello-world tests with Jest, it all fit together and actually made coding easier and more fun. These were the parts that came together to make it work: Jest: Jest is included with create-react-app and is stupid-easy to start using. The Redux reducer, or functions used in the reducer, have to be pure functions and are therefore stupid-easy to test. I pulled some functions out of Redux Container mapStateToProps. These are also pure functions. I also decided that the outputs from mapStateToProps had to have the same structure, and even use most of the same names, as the container component and all of it's child components. In other words, you could dump the data coming out of mapStateToProps a
Read more