threads / discuss / 66878

Branch Awareness

Subject: Branch Awareness

## tl;dr

3 messages between Nov 19, 2026 and Nov 21, 2026.

replies: 2people: 3as markdown or json

Jordan K· Nov 19, 2026, 09:54 UTC · lore
I have a situation at my current workplace that led me to consider this feature:

We crudely pass around a `settings.py` file that doesn't match the one stored in our `main` branch, as many workplaces do.

Feature request: Allow `.gitignore` branch awareness, so that changes/the existence of a specific file are ignored in all branches that are not `specific-branch-name` or ignore the file in ONLY `specific-branch-name`

Sor of like a whitelist/blacklist flag (there should be an option to use either).

I think this is an impactful feature, as many git users have situations where they need to ignore Django migration files, local settings files, compiled binary changes, etc etc but those files _do_ need to exist and be included on the staging/main branches

Regards Jordan Kadish

謝晉凡 Hsieh Chin Fan· Nov 19, 2026, 12:27 UTC · re: Jordan K · lore

Re: Branch Awareness

.gitignore is itself a tracked file. A merge from feature into main would also merge the branch rules. This makes the rules hard to reason about.

What Git already provides based on .git/config:
# .git/config
[includeIf "onbranch:feature/**"]
    path = .git/feature.config
# .git/feature.config
[core]
    excludesFile = .git/feature.ignore    # contains: settings.py

$ git switch main ; git status -s -> ?? settings.py $ git switch feature/x ; git status -s -> (nothing)

On Thu, Nov 19, 2026 at 11:54:02AM +0200, Jordan K wrote:
Show 22 quoted lines
>I have a situation at my current workplace that led me to consider this feature:
>
>We crudely pass around a `settings.py` file that doesn't match the one
>stored in our `main` branch, as many workplaces do.
>
>Feature request:
>Allow `.gitignore` branch awareness, so that changes/the existence of
>a specific file are ignored in all branches that are not
>`specific-branch-name` or ignore the file in ONLY
>`specific-branch-name`
>
>Sor of like a whitelist/blacklist flag (there should be an option to
>use either).
>
>I think this is an impactful feature, as many git users have
>situations where they need to ignore Django migration files, local
>settings files, compiled binary changes, etc etc but those files _do_
>need to exist and be included on the staging/main branches
>
>Regards
>Jordan Kadish
>
-- 
謝晉凡 Hsieh Chin Fan
site: https://topo.tw/about
timezone: GMT-4
Ben Knoble· Nov 21, 2026, 02:38 UTC · re: Jordan K · lore

Re: Branch Awareness

Show 6 quoted lines
> Le 19 nov. 2026 à 04:54, Jordan K <jordankadish93@gmail.com> a écrit :
> 
> I have a situation at my current workplace that led me to consider this feature:
> 
> We crudely pass around a `settings.py` file that doesn't match the one
> stored in our `main` branch, as many workplaces do.

We sometimes carry « .env.example » that folks should modify into « .env », which is ignored.

← back to recent threads