maj doc
This commit is contained in:
		
							parent
							
								
									b4536fdb11
								
							
						
					
					
						commit
						5cb7f31eb1
					
				
							
								
								
									
										25
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								README.md
									
									
									
									
									
								
							| @ -11,12 +11,19 @@ majeure correspondante sur | ||||
| * nulib/spout | ||||
| * nulib/phpss | ||||
| 
 | ||||
| Ouvrir deux consoles | ||||
| * console "74" avec le checkout de la version php7.4 | ||||
| * console "82" avec le checkout de la version php8.2 | ||||
| 
 | ||||
| ~~~sh | ||||
| ## dans les deux consoles | ||||
| 
 | ||||
| version=0.6.0 | ||||
| 
 | ||||
| major="${version%.*}.0" | ||||
| 
 | ||||
| ## branche dev74 | ||||
| ## console 74 | ||||
| 
 | ||||
| git checkout dev74 | ||||
| 
 | ||||
| sed -ri "\ | ||||
| @ -29,7 +36,10 @@ prel -v$version | ||||
| # en cas de conflit, sélectionner HEAD | ||||
| _merge82 | ||||
| 
 | ||||
| ## branche dev82 | ||||
| ## console 82 | ||||
| 
 | ||||
| pu | ||||
| 
 | ||||
| git checkout dev82 | ||||
| 
 | ||||
| sed -ri "\ | ||||
| @ -42,10 +52,21 @@ prel -C | ||||
| commit="$(git log --grep="Init changelog . version ${version}p82" --format=%H)" && | ||||
| echo "commit=$commit" | ||||
| 
 | ||||
| ## console 74 | ||||
| 
 | ||||
| # reprendre la valeur affichée par la précédente commande | ||||
| commit=XXX | ||||
| 
 | ||||
| pu | ||||
| 
 | ||||
| git checkout dev74 | ||||
| 
 | ||||
| git cherry-pick "$commit" | ||||
| pp -a | ||||
| 
 | ||||
| ## console 82 | ||||
| 
 | ||||
| pu | ||||
| ~~~ | ||||
| 
 | ||||
| -*- coding: utf-8 mode: markdown -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8:noeol:binary | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user