Code Monkey home page Code Monkey logo

githubcollaboration's Introduction

GithubCollaboration

Part 1 - Getting started

Partner A

  • Fork & clone this repo
  • Add partner B as a collaborator

Partner B

  • Clone the repo from Partner A
  • Add index.html
  • Commit
  • Push

Partner A

  • Pull down changes from Partner B

Part 2 - Conflicts arise

Both partners:

  • Create a branch (git checkout -b)
  • Add an index.html file and a line of html
  • Commit
  • Push to your branch (git push origin branchname)

Part 3 - Create a pull request

Both partners:

  • On the same screen, create pull requests to compare your branches with the master branch
  • Analyze conflicts, if it's all good merge with Master
  • Pull changes to your branch from master (git pull origin master)
  • Switch to the master branch (git checkout master)
  • Pull changes from master to your local master branch

githubcollaboration's People

Contributors

seanhelvey avatar

Watchers

 avatar

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.