Skip to content

Commit e1b1a51

Browse files
math-alphangadou
andauthored
chore: This change replaces master branch references with main. (#149)
This change replaces `master` branch references with `main`. - Also added `.idea` to the `.gitignore` file to exclude JetBrains IDE project files from version control. Co-authored-by: ngadou <167233353+ngadou@users.noreply.github.com>
1 parent 18986a2 commit e1b1a51

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -127,5 +127,8 @@ dmypy.json
127127
# Vscode
128128
.vscode/
129129

130+
# Jetbrains
131+
.idea
132+
130133
# Pyre type checker
131134
.pyre/

docs/how-to-guides/CONTRIBUTING.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ cd facets-knowledge-panels
3333
# Add upstream remote
3434
git remote add upstream https://github.com/openfoodfacts/facets-knowledge-panels.git
3535

36-
# Fetch and merge with upstream/master
36+
# Fetch and merge with upstream/main
3737
git fetch upstream
38-
git merge upstream/master
38+
git merge upstream/main
3939

4040
## Step 2: Create and Publish Working Branch
4141
git checkout -b <type>/<issue-issueNumber>/{<additional-fixes>}
@@ -62,25 +62,25 @@ git push origin <type>/<issue-issueNumber>/{<additional-fixes>}
6262
# Ensure branch
6363
git branch
6464

65-
# Fetch and merge with upstream/master
65+
# Fetch and merge with upstream/main
6666
git fetch upstream
67-
git merge upstream/master
67+
git merge upstream/main
6868

6969
# Add untracked files
7070
git add .
7171

7272
# Commit all changes with appropriate commit message and description
7373
git commit -m "your-commit-message"
7474

75-
# Fetch and merge with upstream/master again
75+
# Fetch and merge with upstream/main again
7676
git fetch upstream
77-
git merge upstream/master
77+
git merge upstream/main
7878

7979
# Push changes to your forked repository
8080
git push origin <type>/<issue-issueNumber>/{<additional-fixes>}
8181

8282
## Creating the PR using GitHub Website
83-
# Create Pull Request from <type>/<issue-issueNumber>/{<additional-fixes>} branch in your forked repository to the master branch in the upstream repository
83+
# Create Pull Request from <type>/<issue-issueNumber>/{<additional-fixes>} branch in your forked repository to the main branch in the upstream repository
8484
# After creating PR, add a Reviewer (Any Admin) and yourself as the assignee
8585
# Link Pull Request to appropriate Issue, or Project+Milestone (if no issue created)
8686
# IMPORTANT: Do Not Merge the PR unless specifically asked to by an admin.
@@ -93,8 +93,8 @@ git push origin <type>/<issue-issueNumber>/{<additional-fixes>}
9393
git branch -d <type>/<issue-issueNumber>/{<additional-fixes>}
9494
git push --delete origin <type>/<issue-issueNumber>/{<additional-fixes>}
9595

96-
# Fetch and merge with upstream/master
97-
git checkout master
96+
# Fetch and merge with upstream/main
97+
git checkout main
9898
git pull upstream
9999
git push origin
100100
```

0 commit comments

Comments
 (0)