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...
Read more

React-Redux: "Container Component" is Plumbing

-
I think I understand the pieces now... React Functional Components: Are the preferred kind of component we write in React-Redux Are functions that take a "props" object Are the preferred way to output visual stuff and wire up events The Redux Store: Has all the state which we can display Has the dispatch(action) method, which is the only way to change state Your Mission (should you choose to accept it): Use the state and the dispactch(action) function Create props which are data values needed by the functional component Create props which are event handlers that call dispatch(action) The Locations: mapStateToProps : Here you get the state and return props which are just data mapDispatchToProps : Here you get the dispatch function and return props which call it And then React-Redux's "connect" function magically combines the mapping functions and your functional component into a new component which you elsewhere. ---------------------...
Read more

box-shadow

-
box-shadow: [inset] x-offset y-offset [ blur-radius  [ spread-radius ]] [ color ] ; With all zeros, the shadow is exactly under the box. So it's hidden. The x and y offsets are like relative positioning. Take the shadow defined by any other parameters, and just move it. Blur comes first, but I'm going to talk about spread first. Spread-radius extends the shadow outward in all directions by some distance. With blur radius still set to zero, a sharp edged shadow extends outward from the box for the given distance. (It looks like a border.) For blur-radius, take a shadow with an hard edge defined according to your spread-radius. And then "fuzz" outward, putting down some color where there had been none. And fuzz inward, lightening the shadow at its old edge, and letting it darken toward it's actual color setting as you move in from . its old edge. Finally "inset" puts the shadow inside the box, instead of outside. Commas!!! Don't put co...
Read more