Skip to content

Commit a73b809

Browse files
authored
Merge pull request #1 from ChristianEdwardPadilla/master
added initial readme with git info
2 parents 623c555 + 39ad004 commit a73b809

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,22 @@
11
# ReacType
2+
23
Prototyping Tool for React/Typescript Applications
4+
5+
#instructions for git
6+
7+
git add .
8+
git commit -m "unique descriptive message here"
9+
10+
#deal with merge conflicts between your local repo and upstream development
11+
git pull upstream development
12+
13+
#once merge conflicts are dealt with and app is tested:
14+
save files
15+
git add .
16+
git commit -m "message about the merge"
17+
18+
#now push to your fork
19+
git push origin master
20+
21+
#now from within Github:
22+
make a pull request TO DEVELOPMENT BRANCH

0 commit comments

Comments
 (0)