Deploying to gh-pages from master @ 88fe5c16a5 🚀
				
					
				
			This commit is contained in:
		
							parent
							
								
									c34eb456b9
								
							
						
					
					
						commit
						e5cab0b3cf
					
				
					 95 changed files with 2232 additions and 750 deletions
				
			
		| 
						 | 
				
			
			@ -8,7 +8,7 @@ Suppose you have committed to your `master` branch, and now need to update your
 | 
			
		|||
 | 
			
		||||
No one wants to lose work if it can be helped. If you want to save the changes you've already made to your `master` branch, the simplest way to do so is to simply create a duplicate of your "dirty" `master` branch:
 | 
			
		||||
 | 
			
		||||
```sh
 | 
			
		||||
```
 | 
			
		||||
git branch old_master master
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -18,7 +18,7 @@ Now you have a branch named `old_master` that is a duplicate of your `master` br
 | 
			
		|||
 | 
			
		||||
Now it's time to resynchronize your `master` branch. For this step, you'll want to have QMK's repository configured as a remote in Git. To check your configured remotes, run `git remote -v`, which should return something similar to:
 | 
			
		||||
 | 
			
		||||
```sh
 | 
			
		||||
```
 | 
			
		||||
QMKuser ~/qmk_firmware (master)
 | 
			
		||||
$ git remote -v
 | 
			
		||||
origin  https://github.com/<your_username>/qmk_firmware.git (fetch)
 | 
			
		||||
| 
						 | 
				
			
			@ -29,7 +29,7 @@ upstream        https://github.com/qmk/qmk_firmware.git (push)
 | 
			
		|||
 | 
			
		||||
If you only see one fork referenced:
 | 
			
		||||
 | 
			
		||||
```sh
 | 
			
		||||
```
 | 
			
		||||
QMKuser ~/qmk_firmware (master)
 | 
			
		||||
$ git remote -v
 | 
			
		||||
origin  https://github.com/qmk/qmk_firmware.git (fetch)
 | 
			
		||||
| 
						 | 
				
			
			@ -38,31 +38,31 @@ origin  https://github.com/qmk/qmk_firmware.git (push)
 | 
			
		|||
 | 
			
		||||
add a new remote with:
 | 
			
		||||
 | 
			
		||||
```sh
 | 
			
		||||
```
 | 
			
		||||
git remote add upstream https://github.com/qmk/qmk_firmware.git
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
Then, redirect the `origin` remote to your own fork with:
 | 
			
		||||
 | 
			
		||||
```sh
 | 
			
		||||
```
 | 
			
		||||
git remote set-url origin https://github.com/<your_username>/qmk_firmware.git
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
Now that you have both remotes configured, you need to update the references for the upstream repository, which is QMK's, by running:
 | 
			
		||||
 | 
			
		||||
```sh
 | 
			
		||||
```
 | 
			
		||||
git fetch upstream
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
At this point, resynchronize your branch to QMK's by running:
 | 
			
		||||
 | 
			
		||||
```sh
 | 
			
		||||
```
 | 
			
		||||
git reset --hard upstream/master
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
These steps will update the repository on your computer, but your GitHub fork will still be out of sync. To resynchronize your fork on GitHub, you need to push to your fork, instructing Git to override any remote changes that are not reflected in your local repository. To do this, run:
 | 
			
		||||
 | 
			
		||||
```sh
 | 
			
		||||
```
 | 
			
		||||
git push --force-with-lease
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue