mirror of
				https://github.com/Pablo2048/modbus-rtu-master.git
				synced 2025-10-31 16:11:51 +01:00 
			
		
		
		
	Merge pull request #10 from Pablo2048/development
Update GA with access token
This commit is contained in:
		
							
								
								
									
										3
									
								
								.github/workflows/sync-main-to-dev.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/sync-main-to-dev.yml
									
									
									
									
										vendored
									
									
								
							| @@ -12,6 +12,9 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|     - name: Checkout repository |     - name: Checkout repository | ||||||
|       uses: actions/checkout@v2 |       uses: actions/checkout@v2 | ||||||
|  |       with: | ||||||
|  |         # Tento token zajišťuje oprávnění k zápisu | ||||||
|  |         token: ${{ secrets.GITHUB_TOKEN }} | ||||||
|  |  | ||||||
|     - name: Set executable permissions |     - name: Set executable permissions | ||||||
|       run: chmod +x ./update_dev.sh |       run: chmod +x ./update_dev.sh | ||||||
|   | |||||||
| @@ -17,8 +17,8 @@ fi | |||||||
| # Stáhni nejnovější změny z development větve | # Stáhni nejnovější změny z development větve | ||||||
| git pull origin development | git pull origin development | ||||||
|  |  | ||||||
| # Proveď merge z main do development | # Proveď merge z main do development s povolením nesouvisejících historií | ||||||
| git merge main | git merge main --allow-unrelated-histories | ||||||
|  |  | ||||||
| # Pushni změny do vzdálené development větve | # Pushni změny do vzdálené development větve | ||||||
| git push origin development | git push origin development | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user