HelloWord#58
Merged
G0llum05 merged 5 commits intocartabinaria:mainfrom Dec 4, 2025
Merged
Conversation
ali-benny
reviewed
Dec 3, 2025
Member
ali-benny
left a comment
ali-benny
left a comment
There was a problem hiding this comment.
Ciao! @leonardosilenzi @fedefofficial grazie per i vostri commit!
Prima di mergiare la pr GitHub come vedi ci dice che ha conflitti, sarebbero da risolvere! Ciò succede perché sul branch main sono state mergiate delle pr prima di questa che hanno modificato dei file che sono stati modificati anche qui.
| Repository per il Laboratorio fra pari di Git2 - condivisione remota | ||
| Omar. | ||
|
|
||
| Modifiche del 27/11/2025: |
Member
There was a problem hiding this comment.
Nel risolvere i conflitti metterei un titolo qui, qualcosa del tipo:
## Hello World!
o quello che preferite!
Contributor
There was a problem hiding this comment.
Comune la pr è completa. I conflitti sono pochi nel README e ve li risolvo io integrando le due versioni perchè abbiamo bisogno della cartella per il laboratorio di oggi
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue fixed ;)
#32