Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dev-team.md #16

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update dev-team.md #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions dev-team.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ User setup:
```bash
git config --global user.name "Your Name"
git config --global user.email [email protected]
git config --global pull.ff only
```

Create a secure SSH key with a password. Store your SSH key password in your personal private vault in 1Password.
Expand Down Expand Up @@ -221,6 +222,20 @@ Host github.com
Port 443
```

### Default merge strategy

The default merge strategy is fast-forward, if this doesn't work you can create a merge commit:

```
git pull --no-ff
```

Or rebase your changes

```
git pull --rebase
```

### Studio 24 team

In order to access private repos and push code to any repos you need to be a member of the [Studio 24 team](https://github.com/orgs/studio24/teams/dev-team/members). Request this from the Support Team.
Expand Down