Please enable JavaScript.

Coggle requires JavaScript to display documents.

Version control - Coggle Diagram

- - - - <remote>/<branch>
      - network command to update
      - FETCH_AHEAD
      - --set-upstream
    - - Strategies
        
        Recursive
      - Types
        
        Fast-forward
        
        move base branch label
        
        merge commit
        
        may occur merge conflicts
        
        squash
        
        fixup (newer cimmt's message is discarded
        
        git merge --squash
        
        rebase
        
        to resolve conflict - git add . -> git rebase --contiunt
        
        rewriting
        
        Amending
        
        interactive mode
      - Conflicts
        
        resolving
        
        merge base
        
        theirs
        
        mine
    - - repository configuration
        
        from a forked repository into the upstream repository
        
        single repository
      - goal - merging
  - - - for issue a pull request
      - create a different source of truth
      - fork
  - - - upstream repository
        The upstream repository
        is considered the source of
        truth for the project.
      - pros
    - - number of branches
        
        master
        
        developemet
      - rules
        
        only merge commits on master
        
        commit to master only from a release pr hotfix branch
        
        if you commit to master also commit to a develop branch
    - - There is usually a single branch on the remote repository.