diff --git a/dev/developers/git-flow/index.html b/dev/developers/git-flow/index.html index eb382731..a47b8ac2 100644 --- a/dev/developers/git-flow/index.html +++ b/dev/developers/git-flow/index.html @@ -1439,6 +1439,10 @@
We use the develop/master
variation of the OneFlow git flow
We use feature (topic) branches to implement new features
+You are an internal developer if you have writing permissions to the repository.
+Most feature branches are never pushed to the repo, only do so if you expect that its development will take days (to avoid losing your work if you computer is damaged). Otherwise follow the following instructions to locally rebase your feature branch into develop
and push those rebased changes online.
Starting your feature branch
git checkout develop
@@ -1453,30 +1457,78 @@ git pull
git add modified-file1 modified-file2
git commit -m "Add my new feature" # use a concise description
+
+Merging back your feature branch
+If your changes took time to be implemented it is possible that there are new commits in our develop
branch, so we need to rebase your feature branch.
+
-
-
Integrate your new feature to develop
-
-You are an internal developer if you have writing permissions to the repository.
-Most feature branches are never pushed to the repo, only do so if you expect that its development will take days (to avoid losing your work if you computer is damaged). Otherwise follow the following instructions to locally rebase your feature branch into develop
and push those rebased changes online.
+Fetch the latest changes to develop
+
git fetch origin develop
+
+
+-
+
Rebase your feature branch
git checkout feature/feature1
-git fetch origin develop
git rebase -i develop
-git checkout develop
+
+
+-
+
Integrate your new feature to develop
+
git checkout develop
git merge --no-ff feature/feature1 # (use the default merge message)
git push origin develop
git branch -d feature/feature1
-
+
+
+
You are an external developer if you do NOT have writing permissions to the repository.
+Starting your feature branch
+
+- Fork and clone our repository on Github
+- Switch to the latest develop
+
git checkout develop
+
+- Create your feature branch
+
git checkout -b feature/external-test
+
+- Add, modify or delete the necessary files to add your new feature
+- Stage and commit your changes using VS Code git GUI or the following commands
+
git add modified-file1 modified-file2
+git commit -m "Add my new feature" # use a concise description
+
+
+Merging back your feature branch
+If your changes took time to be implemented, it is possible that there are new commits in our develop
branch, so we need to rebase your feature branch.
+
+-
+
Add our repo as another remote
+
git remote add upstream https://github.com/carissalow/rapids/
+
+
+-
+
Fetch the latest changes to develop
+
git fetch upstream develop
+
+
+-
+
Rebase your feature branch
+
git checkout feature/external-test
+git rebase -i develop
+
+
+-
Push your feature branch online
git push --set-upstream origin feature/external-test
-
-Then open a pull request to the develop
branch using Github’s GUI
-
-
Open a pull request to the develop
branch using Github’s GUI