From 26cf4be63188e34286123aa82e3c765aa2a30e71 Mon Sep 17 00:00:00 2001 From: Rounak Das Date: Fri, 21 Jul 2017 19:35:39 +0530 Subject: [PATCH] Add git repository initialization (#69) Add git repository setup step to git setup part of README. Fix indentation issue on `git add ` step --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 416e051..5cf950a 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,12 @@ There are a set of rules to keep in mind: ### 1.2 Git workflow Because of most of the reasons above, we use [Feature-branch-workflow](https://www.atlassian.com/git/tutorials/comparing-workflows#feature-branch-workflow) with [Interactive Rebasing](https://www.atlassian.com/git/tutorials/merging-vs-rebasing#the-golden-rule-of-rebasing) and some elements of [Gitflow](https://www.atlassian.com/git/tutorials/comparing-workflows#gitflow-workflow) (naming and having a develop branch). The main steps are as follow: +* For a new project, initialize a git repository in the project directory. __For susequent features/changes this step should be ignored__. + ```sh + cd + git init + ``` + * Checkout a new feature/bug-fix branch ```sh git checkout -b @@ -106,7 +112,7 @@ Because of most of the reasons above, we use [Feature-branch-workflow](https://w * If you don’t have conflict skip this step. If you have conflicts, [resolve them](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/) and continue rebase ```sh - git add ... + git add ... git rebase --continue ``` * Push your branch. Rebase will change history, so you'll have to use `-f` to force changes into the remote branch. If someone else is working on your branch, use the less destructive `--force-with-lease`.