Git/Sync a Fork - Revision history

Admin: /* updating branch with different name as remote */

2017-11-21T10:26:29Z

updating branch with different name as remote

← Older revision		Revision as of 10:26, 21 November 2017
Line 44:		Line 44:
	</pre>		</pre>

	This will create a commit that merges changes from upstream's master into the local branch oxen.		This will create a commit that merges changes from upstream's <code>master</code> into the local branch <code>oxen</code>.

Admin: /* updating branch with different name as remote */

2017-11-21T10:26:11Z

updating branch with different name as remote

← Older revision		Revision as of 10:26, 21 November 2017
Line 36:		Line 36:
	===updating branch with different name as remote===		===updating branch with different name as remote===

			Suppose we have forked an upstream repository. Further suppose we have a current branch in our fork called <code>oxen</code> and we want to merge changes to the upstream's <code>master</code> branch. We can do this:

			<pre>
			$ cd my-fork/
			$ git checkout oxen
			$ git pull upstream master
			</pre>

			This will create a commit that merges changes from upstream's master into the local branch oxen.

Admin at 23:14, 17 November 2017

2017-11-17T23:14:17Z

← Older revision		Revision as of 23:14, 17 November 2017
Line 2:		Line 2:

	Here's how to do that.		Here's how to do that.

			===updating branch with same name as remote===

			This supposes you are trying to update your master branch with the fork's master branch.

	We'll use the hypothetical Github repos https://github.com/ours/repo for the fork and https://github.com/theirs/repo for the original (forked) repo.		We'll use the hypothetical Github repos https://github.com/ours/repo for the fork and https://github.com/theirs/repo for the original (forked) repo.
Line 28:		Line 32:
	git merge upstream/master		git merge upstream/master
	</pre>		</pre>


			===updating branch with different name as remote===

Admin: Created page with "If you have forked a remote repository using git, and it has fallen behind several commits, you may need to sync your fork. Here's how to do that. We'll use the hypothetica..."

2017-11-17T22:40:03Z

Created page with "If you have forked a remote repository using git, and it has fallen behind several commits, you may need to sync your fork. Here's how to do that. We'll use the hypothetica..."

New page

If you have forked a remote repository using git, and it has fallen behind several commits, you may need to sync your fork.

Here's how to do that.

We'll use the hypothetical Github repos https://github.com/ours/repo for the fork and https://github.com/theirs/repo for the original (forked) repo.

<pre>
# Start by forking the repo on Github...

# Check out the fork
git clone https://github.com/ours/repo

# Add the original (forked) repo as the "upstream"
cd repo/
git remote add upstream https://github.com/theirs/repo

# Do some work...

# Oh no, we missed a bunch of changes to the upstream repo!
# Fetch upstream changes
git fetch upstream

# Checkout the master branch of the fork
# (this assumes the master branch of the original, forked repo is what we want to update from)
git checkout master

# Merge the changes from upstream/master into your local master branch.
git merge upstream/master
</pre>

[[Category:Git]]
[[Category:Github]]