Skip to content

Commit

Permalink
fix: fix contributing branch
Browse files Browse the repository at this point in the history
  • Loading branch information
pranavkparti committed Aug 8, 2023
1 parent 8d62a37 commit e4599d3
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ There are lots of opportunities to offer ideas and take ownership of larger piec

- Create a branch for the issue in your local repo
- Make your changes and test everything works locally
- Push your changes to your fork on GitHub and create a pull request into Greenstand/main
- Push your changes to your fork on GitHub and create a pull request
into `treetracker-wallet-admin-client/<target_branch>`. The target branch is currently `v1`.
- Fill in as much info as you can in the PR, including screenshots or videos of the change to help the reviewer
understand what you've done
- A member of the review team will review your changes and may request changes
Expand All @@ -73,17 +74,17 @@ Your forked repo won't automatically stay in sync with Greenstand, so you'll nee
typically before starting work on a new feature).

```
git checkout master
git pull upstream master --rebase
git push origin master
git checkout <target_branch>
git pull upstream <target_branch> --rebase
git push origin <target_branch>
```

If there are merge conflicts in your PR, you may need to rebase your branch. Ask a member of the team if you need help
with this.

```
git checkout <feature_branch>
git pull upstream master --rebase
git pull upstream <target_branch> --rebase
git push origin <feature_branch> --force
```

Expand Down

0 comments on commit e4599d3

Please sign in to comment.