-
Notifications
You must be signed in to change notification settings - Fork 567
VC | 'develop' 'master' workfow cheat sheet
First time in each local git repo:
$ cd Trilinos/
[(master)]$ git fetch
[(master)]$ git checkout --track origin/develop
[(develop)]$
Otherwise, do:
[(master)]$ git checkout develop
[(develop)]$
Once on local 'develop' tracking branch, then just do the feature branch workflow.
See more details here.
WARNING: Don't make the following mistake:
$ git checkout -b develop
That is NOT a tracking branch and raw git pull
and git push
will not work!
Copyright © Trilinos a Series of LF Projects, LLC
For web site terms of use, trademark policy and other project policies please see https://lfprojects.org.
Trilinos Developer Home
Trilinos Package Owners
Policies
New Developers
Trilinos PR/CR
Productivity++
Support Policy
Test Dashboard Policy
Testing Policy
Managing Issues
New Issue Quick Ref
Handling Stale Issues and Pull Requests
Release Notes
Software Quality Plan
Proposing a New Package
Guidance on Copyrights and Licenses
Tools
CMake
Doxygen
git
GitHub Notifications
Mail lists
Clang-format
Version Control
Initial git setup
'feature'/'develop'/'master' (cheatsheet)
Simple centralized workflow
Building
SEMS Dev Env
Mac OS X
ATDM Platforms
Containers
Development Tips
Automated Workflows
Testing
Test Harness
Pull Request Testing
Submitting a Pull Request
Pull Request Workflow
Reproducing PR Errors
Addressing Test Failures
Trilinos Status Table Archive
Pre-push (Checkin) Testing
Remote pull/test/push
PR Creation & Approval Guidelines for Tpetra, Ifpack2, and MueLu Developers