Please enable JavaScript.

Coggle requires JavaScript to display documents.

VCS (BRANCHING & MERGING (GIT STASH (GIT STASH POP (APPLY MOST RECENT…

- - - - GIT BRANCH -d <branch name>
    - - GIT BRANCH -d <BR NAME>
  - - - AUTO DETECT CONFLICT & DISPLAY
      - COMMIT AGAIN & MERGE
    - - MERGE
      - GIT BRANCH -D BRANCHNAME (-D = DELETE)
  - - - bring back the stashed file
    - - APPLY MOST RECENT STASH
      - REMOVE STASH FROM STASH STACK
    - - DELETES ENTIRE STASH STACK
- - - - POINTS TO PREVIOUS HEAD
      - MAKES THE BRANCH LINEAR
      - A. TXT FILE CHANGED IN LOCAL AND REMOTE. TO PULL IT TO LOCAL WE DONT WANT A COMMIT. SO WE USE REBASE.
      - CREATES LATEST COPY OF MASTER WITHOUT NEW COMMIT
    - - MERGE CREATES NEW COMMIT
        
        POINTS TO CURRENT HEAD
        
        NON LINEAR
        
        MERGES 2 DIFFERENT BRANCHES.
        
        CHECKOUT TO THE BR WHILL WILL EXISTS & EXECUTE MERGE
        
        GIT CHECKOUT -B <NEW BR>
        
        GIT CHECKOUT -D <DELETE MERGED BR>
        
        USES LATEST VERSIONS OF BOTH BR.
        
        merge branches delete (-d), unmerged br delete (-D)
        
        git config --global merge.tool <toolname>
        
        git mergetool
    - - BR TO BR WE USE MERGE
      - BR TO MASTER WE USE REBASE
      - GENERALLY GIT PULl IS FOLLOWED BY REBASE COMMAND
  - - - HEAD MEANS LATEST COMMIT
  - - - keeps all unstaged files
        
        upto B. all unstaged files wiped out
    - - MODIFIERS
        
        DECIDES DEGREE OF RESET
        
        points to B and keeps unstaged files as is
      - mixed is default
  - - - HEAD = LATEST CHANGES
- - - - BUGFIXES
      - MAINTENANCE
      - DEVELOPMENT
  - - - CLONE OF PUBLIC (PVT REPO OF COLLABORATOR)
      - PVT REPO
      - PVT REPO (DUPLICATE COPY)
      - BACKUP OF PUBLIC REPO SOMEWHERE ELSE
- - - - ADD WEBHOOK
      - TEST (PUSH EVENTS)
      - SAME PROCESS GITLAB & GITHUB
    - - INSTALL RUBY (RUBY -V)
        
        APT-GET INSTALL RUBY
        
        RUBY WEBHOOK.RB 8000
    - - allow ext services to be notified when certain event happens
      - SEND POST REQ. TO EACH URL (POST HOOKS)
      - HOW WEBHOOK WILL RUN
        
        FOREGROUND
        
        RUNS ON CONSOLE, ELSE KILLED
        
        BACKGROUND
        
        FORMAT OF OPTPUT (JSON ETC..)
    - - RAVIAARE/SPRINGEXAMPLE
  - - - LEARN TO CODE PRE HOOKS :red_cross:
  - - - AFTER CHERRY -PICK ADD & COMMIT & PUSH