# Fixing two minor git irritations in my OSS fork workflow

DevFeed: [Fixing two minor git irritations in my OSS fork workflow](<https://devfeed.tech/articles/fixing-two-minor-git-irritations-in-my-oss-fork-workflow-39468.md>)

Original publisher: [Read original article](<https://akrabat.com/fixing-two-minor-git-irritations-in-my-oss-fork-workflow/>)

Author: Rob

Published: 2026-05-26T10:00:00Z

Content type: tutorial

Language: en

Sources: [Rob Allen](<https://devfeed.tech/sources/rob-allen.md>)

Topics: [Git](<https://devfeed.tech/topics/git.md>), [Pull Request](<https://devfeed.tech/topics/pull-request.md>)

Tags: [branch](<https://devfeed.tech/tags/branch.md>), [development](<https://devfeed.tech/tags/development.md>), [fork](<https://devfeed.tech/tags/fork.md>), [git](<https://devfeed.tech/tags/git.md>), [oss](<https://devfeed.tech/tags/oss.md>), [project](<https://devfeed.tech/tags/project.md>), [remote](<https://devfeed.tech/tags/remote.md>), [repo](<https://devfeed.tech/tags/repo.md>), [workflow](<https://devfeed.tech/tags/workflow.md>)

## AI overview

A practical guide to reducing two minor irritations in an open-source Git fork workflow: ensuring the local main branch tracks upstream/main and configuring new branches to push to origin automatically on their first push.

## Source excerpt

For OSS work, I work with two git remotes: upstream: the canonical OSS project repository, where main is the default branch and is what gets released. origin: a personal fork. All my feature branches live here. I set up locally like this: Fork the project repo to my account. Clone my fork locally, so the origin remote is my fork. Set an upstream remote using git remote add upstream <ssh-url>. and then when working on... continue reading.