Skip to content

Final Capstone Project meant to liberate all people from their diminutive lives

License

Notifications You must be signed in to change notification settings

JNoris/Capstone-Project

Repository files navigation

# Capstone-Project
Capstone Project meant to liberate all people from their diminutive lives

Installing Source Control:
First of all, you must have the github extension/setting/whatever installed on whichever IDE you are currently using. 

Vscode: Look in the extension marketplace and search up git.

Git: you could also download git and link github to it and use the git terminal to upload to and fro your desktop to the source control version (SCV).

OR

Github desktop: This is the GUI version of git, download from github.

Visual Studio: Should automatically have git support installed, if not, check the visual studio installer (if you have visual studio, you definitely have visual studio installer as well).

IntelliJ, Eclipse, netbeans, etc: I have no idea, search it up.

****************

Branch Guide: There are several branches in this github due to the scope of the project, each branch is to serve a specific purpose, do not defile their purpose. Or else.

DO NOT UNDER ANY CIRCUMSTANCE UPLOAD TO MASTER OR STABLE BRANCH, we will do that when the entire group is around and it's under explicit consensus from everyone to upload, until then, keep your code local.

Consider stable to always represent the latest code deployed to production. During day to day development, the stable branch will not be interacted with.

When the source code in the master branch is stable and has been deployed, all of the changes will be merged into stable and tagged with a release number.

Master: Default development branch, in most cases, this contains the local development, though that is purely by convention and is not required. In our case, it's our most active branch since it contains our recent changes to the application.

Stable: A stable branch is a development or feature branch that is guaranteed to build and pass integrated tests.
 - Must branch from: Master.
 
Init: When in doubt, upload here, this is the initialization of all files, in a perfect world this would not be used, but we're not perfect.

Feature: A feature branch is where new development is done. However, master should be merged periodically into a feature branch.
 - Must branch from: Master.
 - Must merge to: Master.

****************
Common Terms:

Branch: is an active line of developement, the most recent commits to a branch is referred to as the tip of that branch.

Pull or pull request: Where you 'fetch' code from github and 'merge' to your desktop's local repository/branch in order to work on that code locally. 

Push: Upload code to github, you must specify the branch in order to push successfully. Yes, it does matter which branch you upload to.

Fetch: Fetching = download basically, fetching a branch downloads all the files of that branch in a zip file.

Blame: View line-by-line history of a file and see who worked on it and etc.

Merge: Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge.




Releases

No releases published

Packages

No packages published

Languages