Skip to content

Integration manager workflow

Scott Charlton edited this page Jan 31, 2018 · 2 revisions

Based on Pro Git, Second Edition

see https://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows#Integration-Manager-Workflow

Clone the master branch:

$ git clone https://github.com/i-RIC/prepost-gui.git

Create local branch projection:

$ git checkout -b projection

Make modifications to the following files:

libs/gui/misc/iricmainwindowactionmanager.cpp
libs/gui/misc/iricmainwindowactionmanager.h
libs/guicore/datamodel/vtk3dgraphicsview.cpp
libs/guicore/datamodel/vtk3dgraphicsview.h
libs/guicore/project/projectdataitem.cpp
libs/post/post3d/post3dwindow.cpp
libs/post/post3d/post3dwindow.h

Stage the files:

$ git add \
libs/gui/misc/iricmainwindowactionmanager.cpp\
libs/gui/misc/iricmainwindowactionmanager.h\
libs/guicore/datamodel/vtk3dgraphicsview.cpp\
libs/guicore/datamodel/vtk3dgraphicsview.h\
libs/guicore/project/projectdataitem.cpp\
libs/post/post3d/post3dwindow.cpp\
libs/post/post3d/post3dwindow.h

Commit locally (same as https://my.redmine.jp/svn/iric/v3.X/gui/branches/projection@6366):

$ git commit -m "implements changing between parallel and perspective views"

Go to https://github.com/i-RIC/prepost-gui and click the "Fork" button

Add fork as new remote:

$ git remote add myfork https://github.com/scharlton2/prepost-gui

Push topic branch to new (writable) remote:

$ git push -u myfork projection

Open a pull request to be checked and merged into i-RIC/prepost-gui :master

Clone this wiki locally