Working on a section or module or Got a new feature to add to pageweb.
Use the git workflow defined below.
-
Checkout to branch
$ git checkout master
-
Create a new branch from branch and give it a reasonable name
$ git checkout -b
At this point, you are on
-
Add this branch to remote so others developers can see updates on this feature you are working on.
$ git push --set-upstream origin
-
After reasonable addition to code, commit changes and push to remote branch
$ git push origin
-
When you are done with the feature or addition, merge this with the branch squashing all commits also.
$ git checkout master
you are now in branch
$ git merge --squash <branch-name>
-
Now, commit all changes from that branch.
$ git commit -m "Adding my cool feature"
-
Push to origin
$ git push origin master
When you are working on the other branch, you should periodically checkout to branch and do a git pull
to update your master branch cos there are chances that some other Great developers like Laju Morrison :) might
have pushed some commits. After pulling changes, $ git checkout to your and merge branch.
This is so your is always updated to the latest code while you are still working on that cool feature.
below is the sample command. Lets say you are currently on
$ git checkout master
$ git pull origin master
$ git checkout <branch-name>
$ git merge master
Thanks to all working on PageWeb application...
Big credits goes to the founders