🤓
Thomas lab
Git&Github
Git&Github
  • Fetching & Pulling
  • Git alias
  • Git & Github : What is in .git ?
  • Git Rebase
  • Git reflog
  • Git Stash
  • Git tags
  • Git Workflow(Collaboration)
  • Quick High-Level
  • Git diff
  • Git installer
  • Reset & Revert commit
  • Github Collaborators
  • Github Basics
  • Introducing Git
  • Merging Branch
  • How to use multiple account
Powered by GitBook
On this page
  • Git workflow
  • Centralized workflow
  • Feature branches
  • Feature branch naming
  • Merging in feature branches
  • Pull Request
  • The workflow
  • Fork Pull
  • To summarize

Git Workflow(Collaboration)

Git workflow

Centralized workflow

AKA everyone works on master/main AKA the most basic workflow possible

The simplest collaborative workflow is to have everyone work on the master branch (or main,or any other single branch).

It's straightforward and can work for tiny teams,but it has quite a few shortcoming

Feature branches

  • Rather than working directly on master/main, all new development should be done on separate branches !

  • Multiple teammates can collaborate on a single feature branch and share code back and forth without puooluting the master/main

  • master/main branch won't cotianer broke code (or at leats,it won't unless someone mess up)

Feature branch naming

There are many different approaches for naming feature branhes. Ofter you'll see branch names that include slashes like bug/fix-scroll or feature/login-form or feat/button/anable-point-event.

Special teams and projects ussually have their own branhc naming convertions. To keep these slides simple and concise,i'm just going to ignore those best-practices for now.

Merging in feature branches

At some point new the work on feature branches will need to be merged in to the master branch !There are a coiple of options how to do this ...

  1. Merge at will, withour any sort of discusssion with teammates.JUST DO IT WHENEVER YOU WANT.

  2. Send an emaill or chat message or something to your team to discuss if the changes should be merged in

  3. Pull Request

Pull Request

Pull request are a feature built in to products like github & githucket. THey are not native to git itself

They allow developers to alert team-members to new work that need to be reviewd. They provide a machism to approve or reject the work on a given branch. They also help facilitate discussion and feedback on specified commits

The workflow

  1. Do some work locally on a feature branch

  2. Push up the feature to github

  3. open a pull request using the feature branch just pushed up to github .

  4. Wait for the PR to be approve and merged . Start a discussion on the PR. this part depend on the team structure .

Fork Pull

A fork in Git is simply a copy of an existing repository in which the new owner disconnects the codebase from previous committers. A fork often occurs when a developer becomes dissatisfied or disillusioned with the direction of a project and wants to detach their work from that of the original project.

To summarize

  1. I fork the original project repo on github

  2. I clone my fork to my local machine

  3. I add a remote pointing to original project repo. the remote is often named upstream

  4. I make changes and add/commit on a featur branch on my local machine

  5. i push up my new feature branch to my my forked repo (ussually called origin)

  6. I open a pull request to the original project repo containing the new work on my forked repo

  7. Hopefully the pull request is accepted and my changes are marrged in !

PreviousGit tagsNextQuick High-Level

Last updated 8 months ago