my proposal

[stephentjemkes]

MDN URL

https://developer.mozilla.org/en-US/docs/Learn_web_development/Extensions/Server-side/Django/development_environment

What specific section or headline is this issue about?

No response

What information was incorrect, unhelpful, or incomplete?

I could change the web page myself but not sure if somebody will review it before the page goes online. Hence my suggestions below

What did you expect to see?

It is helpful at this point to get a little more overview of your local branches by typing

git log --oneline --decorate --graph --all
you will see the HEAD is pointing to the update_gitignore (i.e. that is the branch you are working on) and there is an origin/main which is were the branch was created from.
As later in the tutorial other branches are created from the remote repository to capture the modifications described in the tutorial it is required to merge the update_ignore with the origin/main branch.
First we commit the changes in the branch which is currently being modified (i.e. the update_gitignore branch)
git add -A
add the text about status
git status
add the text about commit
git commit -m ".gitignore: add .bak and .sqlite3"

Now we need to merge the update_ignore branch with the main branch to capture the modifications in the main branch
switch to the main branch

git switch main
check that you are in the main branch. this can be done using "git status" or "git log --oneline --decorate --graph --all" your choice.
git log --oneline --decorate --graph --all
this will now show that the HEAD is pointing to main.
then merge the main and update_gitignore branches
git merge git_ignore
and push the (local) main to the (remote) origin
git push

you can check that your .gitignore file of the main branch includes the modifications

more .gitignore

At this point there is no need for the update_gitignore branch anymore and hence this branch can be deleted

git branch -d update_gitignore

=============================================================================

I think this is the clean way to use git

what you wrote about fetch/pull etc will work as well but I found it confusing and potentially you are left with obsolete branches.

Do you have any supporting links, references, or citations?

No response

Do you have anything more you want to share?

No response

MDN metadata

Page report details

• Folder: en-us/learn_web_development/extensions/server-side/django/development_environment
• MDN URL: https://developer.mozilla.org/en-US/docs/Learn_web_development/Extensions/Server-side/Django/development_environment
• GitHub URL: https://github.com/mdn/content/blob/main/files/en-us/learn_web_development/extensions/server-side/django/development_environment/index.md
• Last commit: 3093324
• Document last modified: 2026-03-28T16:57:48.000Z