-->

1. Compare Git Branches
2. Beyond Compare Git Branches
3. Git Branches List

Branches, origins, tags and stashes. Fork displays your commits and branches in the most clear way. Selected commit details, changes and file tree. Open recent repositories. Feature Overview. Basic features. Fetch, pull, push. Commit, amend. Create and delete branches and tags. SmartGit, Git Extensions, and GitKraken are probably your best bets out of the 24 options considered. 'Gratis for non-commercial use' is the primary reason people pick SmartGit over the competition. This page is powered by a knowledgeable community that helps you make an informed decision.

Azure Repos Azure DevOps Server 2019 TFS 2018

A fork is a complete copy of a repository, including all files, commits, and (optionally) branches.Forks are a great way to support an Inner Source workflow: you can create afork to suggest changes to a project when you don't have permissions towrite to the original project directly.Once you're ready to share those changes, it's easy to contribute them back using pull requests.

What's in a fork

A fork starts with all the contents of its upstream (original) repository.When you create a fork, you can choose whether to include all branches or limit to only the default branch.None of the permissions, policies, or build pipelines are applied.The new fork acts as if someone cloned the original repository, then pushed to a new, empty repository.After a fork has been created, new files, folders, and branches are not shared between the repositories unless a PR carries them along.

Compare Git Branches

Sharing code between forks

You can create PRs in either direction: from fork to upstream, or upstream to fork.The most common direction will be from fork to upstream.The destination repository's permissions, policies, builds, and work items will apply to the PR.

Choosing between branches and forks

For a very small team (2-5 developers), we recommend working in a single repo.Everyone should work in topic branches, and master should be protected with branch policies.As your team grows larger, you may find yourself outgrowing this arrangement and prefer to switch to a forking workflow.

If your repository has a large number of casual or infrequent committers (similar to an open source project), we recommend the forking workflow.Typically only core contributors to your project have direct commit rights into your repository.You should ask collaborators from outside this core set of people to work from a fork of the repository.This will isolate their changes from yours until you've had a chance to vet the work.

Note

To enable forking at the organization level, go to Project Settings > Repositories, then select the repository and Options next to the Security tab to turn on forks.

For some versions this might require enabling forking as a Preview Feature, see User settings > Preview Features, then select For this organization from the drop-down, and make sure Git Forks is turned on.

The forking workflow

Create the fork

1. Navigate to the repository to fork, and choose Fork.

2. Specify a name, and choose the project where you want the fork to be created. If the repository contains a lot of topic branches, we recommend you fork only the default branch.

3. Choose Fork to create the fork.

Note

You must have the Create Repository permission in your chosen project to create a fork.We recommend you create a dedicated project for forks where all contributors have the Create Repository permission. For an example of granting this permission, see Set Git repository permissions.

Clone your fork locally

Once your fork is ready, clone it using the command line or an IDE like Visual Studio.The fork will be your origin remote.

For convenience, after cloning you'll want to add the upstream repository (where you forked from) as a remote named upstream.

To add your upstream repository in Visual Studio, follow these steps:

1. Open the Settings page.

2. Choose Repository Settings.

3. Under Remotes, choose Add.

4. Add a new remote called upstream, using the Git clone URL of the repo you forked.

5. Select Save and the new remote is added and displayed in the repository settings.

Beyond Compare Git Branches

On the command line, navigate to your repository, and type:

git remote add upstream {upstream_url}

Git Branches List

Make and push changes

It's possible to work directly in master - after all, this fork is your personal copy of the repo.We recommend you still work in a topic branch, though.This allows you to maintain multiple, independent workstreams simultaneously.Also, it reduces confusion later when you want to sync changes into your fork.

Make and commit your changes as you normally would.When you're done with the changes, push them to origin (your fork).

Create and complete a PR

Open a pull request from your fork to the upstream.All the policies, required reviewers, and builds will be applied in the upstream repo.Once all policies are satisfied, the PR can be completed and the changes become a permanent part of the upstream repo.

After a couple of conversions, you get a notice that it can’t find the files. Free software to convert mp3 to wav for mac free. And there we find the files they couldn’t find. So you go back to the beginning of your backups, and try to remember where you left off after you restart this app.

Important

Anyone with the Read permission can open a PR to upstream.If a PR build pipeline is configured, the build will run against the code introduced in the fork.

Sync your fork to latest

When you've gotten your PR accepted into upstream, you'll want to make sure your fork reflects the latest state of the repo.We recommend rebasing on upstream's master branch (assuming master is the main development branch).

In Visual Studio, you can use the Synchronization page to fetch and rebase.

1. Open the Synchronization page in Team Explorer.

2. Fetch from upstream.

3. Open the Branches page in Team Explorer. Make sure master is checked out.

4. Rebase master onto upstream/master.

Now you're all set to start your next feature on a new topic branch.

On the command line, navigate to your repository and run:

The forking workflow lets you isolate changes from the main repository until you're ready to integrate them.When you're ready, integrating code is as easy as completing a pull request.