Giter Club home page Giter Club logo

cbs_practice's Introduction

CBS Practice

This is documentation of Sarah and Nancy's pilot GitHub project

Basic navigating, adding, and pushing

$ cd your_directory_here
$ ls
$ git add .
$ git status
$ gitcommit -m "I made an edit. Yay."
$ git push

Pulling from master

$ git pull origin master

Dealing with merge conflicts

  • Do a pull
  • Manage conflicts
  • Remove markers of the conflicts (>>>> and ======)
  • Push again

Creating a branch

$ git checkout -b branch-name
$ git add . 
$ git commit -m "your message"
$ git push origin branch-name

Returning to the master to make a commit

$ git checkout master
$ git pull the-branch-you-want-t-pull-from
$ git add .
$ git commit -m "your message"
$ git push origin master

To check which branch you're on:

$ git branch

The starred repo is the current one.

When you forgot to pull

press "i" write your merge message press "esc" write ":wq" then press ent

Committing a branch file to the master:

https://www.sap.com/developer/tutorials/webide-github-merge-pull-request.html

$ git checkout your-branch
$ git add . 
$ git commit -m “message”
$ git push

$ git checkout master
$ git pull origin master
$ git merge your-branch -m “comment”
$ git push

Forking a repo

  • First, fork from the GitHub page of the repo you’d like
  • Navigate to directory on your machine
$ git clone url-of-forked-repo

Updating your fork to match updated original

https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/ …starting in YOUR FORK’s repo on your machine

$ git checkout master
$ git pull https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME
$ git push

cbs_practice's People

Contributors

nancyorgan avatar smonsell avatar

Stargazers

 avatar

Watchers

 avatar  avatar

Forkers

smonsell

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.