Changes between Version 70 and Version 71 of HowToGit


Ignore:
Timestamp:
Aug 31, 2019, 12:27:42 AM (5 years ago)
Author:
martinl
Comment:

same procedure as with core repo

Legend:

Unmodified
Added
Removed
Modified

  • HowToGit

    v70 v71  
    122122Continue do your changes and commit/push them (ideally to a feature branch, see above).
    123123
    124 === Workflow for grass-addons repository ===
    125 
    126 '''- to be discussed -'''
    127 
    128 Direct commits are allowed, but you can still use alternatively the same workflow as defined for [HowToGit#Workflowforcoregrassrepository core repository based on PRs].
    129 
    130 One time only:
    131 {{{
    132 # "origin" points to your grass-addons repo - no fork needed
    133 git clone git@github.com:OSGeo/grass-addons.git
    134 }}}
    135 
    136 Work with git:
    137 {{{
    138 # <make local source code changes>
    139 vim ...
    140 
    141 # list local changes
    142 git status
    143 git add file1.c file2.py ...
    144 git commit -m 'my change with reasonable explanation...'
    145 
    146 # assuming that "origin" points to OSGeo/grass-addons
    147 git fetch origin
    148 # IMPORTANT - ALWAYS REBASE IN ORDER TO AVOID NOT NEEDED MERGE COMMITS (!!!)
    149 git rebase origin/master
    150 
    151 # push feature branch to origin, i.e. directly to OSGeo/grass-addons repo
    152 git push origin
    153 }}}
    154124
    155125== Switching between branches ==