-
Notifications
You must be signed in to change notification settings - Fork 0
/
git-workflow.txt
42 lines (24 loc) · 1.31 KB
/
git-workflow.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
The following scenarios illustrate using git update mb2eml.
If you don't already have an MB2EML git repository you can create
one using the following commands:
% cd <some directory>
% git clone https://github.com/sbpcs/MB2EML
Scenario 1 - Make a change to the devel branch, push devel branch to github
The intent of this workflow is to make and share changes on the devel branch, so that
potentially risky changes can be reviewed and tested by multiple people, without
updating the master branch with unproven changes.
- git checkout devel
Change the current branch to 'devel'.
- git pull origin devel
Pull the most recent changes from 'devel' on github before you begin making your changes.
The 'git pull' command will always update your current branch, so be careful and checkout
the branch you want to update.
- make changes to README.txt
- git add README.txt
This command 'stages' a copy of README.txt for the next 'git commit'.
- git commit -m "your commit comment goes here"
Store the changes that were staged and create a commit.
- git push origin devel
Push the new commit in the devel branch to github.
At this point other people can perform a 'git pull origin devel' to get the changes to README.txt
Scenario 2 - Make a change to devel branch, merge with master, push master to github