Skip to content

ronxldwilson/Sacred-Timeline

Repository files navigation

Sacred-Timeline

Protect this Timeline at all possible cost, do not make unnecessary pull requests to this repository.

How to Contribute


Step 1: Fork this Repository and create a copy with yourself
Step 2: Create a local branch in your device and test your features in that branch, when you feel the features in the branch are worth comitting to the sacred timeline
Step 3: Open a pull request from your branch to the Sacred Timeline
Step 4: After review if the code is accepted into the Sacred Timeline,
Step 5: Then use the contribute feature in your forked repo to equalize with the sacred timeline,
Step 6: **NEVER COMMIT YOUR SIDE BRANCHES TO YOUR FORKED REPOSITORY**
Step 7: Always ensure that your forked repo is in always sync with the Sacred Timeline
Step 8: Repeat the above mentioend process for each new feature which you are creating
Note: If there are any merge conflicts happening with your branch and the sacred Timeline, that won't be resolved, you will need to resolve and send another pull request
We are doing all of this untill we figure out a way to resolve merge conflicts, until then "THIS IS THE WAY"


This is the general timeline of adding any feature:
Create a branch for a new feature >>>>> Check if this branch can make commits to the Sacred Timeline >>>>>

if yes, then>>>>> open a pull request and when your branch is added to the Sacred Timeline >>>>> Open the fetch option and make your forked repo equal to Sacred Timeline



If No, then>>>> There is a merge conflict resolve it and then make a pull request >>>>> Merge Conflicts will not be resolved at Sacred Timeline

Naming Conventions/procedure



1: Give the name to your new branch as "Name/FeatureName"
2: Once the feature is ready create a pull request to ask the sacred timeline to add this new feature to main timeline
3: Once the feature has been accepted in the timeline then procced on to make update your remote repo with the sacred timeline
4: Once your forked remote is in sync with the sacred timeline, go to android studio terminal and type out "git pull --rebase"
5: Make sure while typing out the above command you are in your master branch
6: Once your local master is in sync with the sacred timeline, it is safe to delete the old branch and proceed with creating a new branch and creating new features in it

Releases

No releases published

Packages

No packages published

Contributors 4

  •  
  •  
  •  
  •  

Languages