From a1a2fa8b5bb8d1ee6cc1d0dadba8aa02e8572803 Mon Sep 17 00:00:00 2001 From: Jogendra Singh Date: Tue, 2 Jan 2018 23:51:27 +0530 Subject: [PATCH 1/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 16b116d..d88062b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Wheelstreet Vega ### Installation 1. Clone the repo via git clone command. -```git clone https://bitbucket.org/wheelstreet/vega.git``` +```https://github.com/imjog/Wheelstreet-GO.git``` 2. Run the following command to install all the third-party libraries. ```pod install``` @@ -36,4 +36,4 @@ Trivial fixes to tickets can be made directly to the relevant branch and should ### Contact -For any further details contact [jd@wheelstreet.in](mailto:jd@wheelstreet.in) \ No newline at end of file +For any further details contact [jd@wheelstreet.in](mailto:jd@wheelstreet.in) From 74e53f6847e1a6de3891ebd0f883bc0052028447 Mon Sep 17 00:00:00 2001 From: Jogendra Singh Date: Tue, 2 Jan 2018 23:53:25 +0530 Subject: [PATCH 2/3] Update README.md --- README.md | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/README.md b/README.md index d88062b..54c1956 100644 --- a/README.md +++ b/README.md @@ -10,30 +10,9 @@ Wheelstreet Vega ### Coding standards -Please follow the following guides and code standards: +Followed the following guides and code standards: [Swift Style Guide](https://github.com/linkedin/swift-style-guide) -### Git Branching Model - -We use a variant of [nvie's git branching model](http://nvie.com/posts/a-successful-git-branching-model/) for our workflow. - -The following main branches exist: - -* __``master``__ always points to the latest stable release. Any merge into master must represent a stable release as far as we can tell. -* __``release``__ always points to the latest, stable, development code. This should theoretically always be production-ready, but that is not guaranteed. - -There are also some "supporting branch" types. Any supporting branch must be reviewed before being merged. - -* __Develop branches__. Naming convention: ``develop/``. These branches originate from the release branch and may only receive bugfixes for release blockers (i.e. in the case of a blocker for the release, hotfix branch can be merged into develop branch). Essentially, they represent release candidates. The develop branch should be merged back into the ``release`` branch on a regular basis. When the release candidate is accepted, it will be merged into the release and master branch respectively. The master branch merge commit will be tagged with the new version number. - -* __Hotfix branches__. Naming convention: ``hotfix/``. These branches represent *severe bugs* in the master branch. They originate from the master branch and fix a specific issue. Once checked and confirmed, they are merged into the master branch as a new point release, as well as being merged into the current develop branch, or the release branch if no release is under way. - -* __Feature branches__. Naming convention: ``feature/``. These branches represent large new features - for example, a large refactor or major UI change. Feature branches may only originate from the ``develop`` branch and may only be merged into the ``develop`` branch. - -* __Ticket branches__. Naming convention: ``ticket/``. These branches represent tickets from the bug tracker which are not severe bugs in the master branch, and which have non-trivial solutions. Ticket branches may originate from ``release`` (if the ticket is a release blocker), a feature branch (if the ticket is specific to that feature) or a develop branch. They are merged into the branch they originated from. - -Trivial fixes to tickets can be made directly to the relevant branch and should include the ticket number prominently in the commit message. - ### Contact For any further details contact [jd@wheelstreet.in](mailto:jd@wheelstreet.in) From ad612374e6eb7d95f9d075c240d4bec29272c1b3 Mon Sep 17 00:00:00 2001 From: Jogendra Singh Date: Tue, 2 Jan 2018 23:55:00 +0530 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 54c1956..3ece7af 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ Followed the following guides and code standards: ### Contact -For any further details contact [jd@wheelstreet.in](mailto:jd@wheelstreet.in) +For any further details contact [jogendra.singh.jog@gmail.com](mailto:jogendra.singh.jog@gmail.com)