Jessica Poémape (she/her) jesspoemape

## gist:1885435

      
              1 file
            
          
              867 forks
            
          
              188 comments
            
          
              2992 stars
            
          
                CristinaSolana
                / gist:1885435
            
            
              Created
              February 22, 2012 14:56
            
              
                Keeping a fork up to date
              
          
    1. Clone your fork:

git clone git@github.com:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream


## git-feature-workflow.md

      
              1 file
            
          
              183 forks
            
          
              51 comments
            
          
              607 stars
            
          
                blackfalcon
                / git-feature-workflow.md
            
            
              Last active
              April 13, 2024 07:33
            
              
                Git basics - a general workflow
              
          
    Git-workflow vs feature branching

When working with Git, there are two prevailing workflows are Git workflow and feature branches. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited, and the focus of this article.
If you are new to Git and Git-workflows, I suggest reading the atlassian.com Git Workflow article in addition to this as there is more detail there than presented here.
I admit, using Bash in the command line with the standard configuration leaves a bit to be desired when it comes to awareness of state. A tool that I suggest using follows these instructions on setting up GIT Bash autocompletion. This tool will assist you to better visualize the state of a branc