mirror of
				https://github.com/mealie-recipes/mealie.git
				synced 2025-10-30 17:53:31 -04:00 
			
		
		
		
	
		
			
	
	
		
			11 lines
		
	
	
		
			283 B
		
	
	
	
		
			Bash
		
	
	
	
	
	
		
		
			
		
	
	
			11 lines
		
	
	
		
			283 B
		
	
	
	
		
			Bash
		
	
	
	
	
	
|  | git checkout dev | ||
|  | git merge --strategy=ours master    # keep the content of this branch, but record a merge | ||
|  | git checkout master | ||
|  | git merge dev             # fast-forward master up to the merge | ||
|  | 
 | ||
|  | 
 | ||
|  | ## TODOs | ||
|  | 
 | ||
|  | # Create New Branch v0.x.x | ||
|  | # Push Branch Version to Github | ||
|  | # Create Pull Request |