-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0aee745
commit 591327a
Showing
3 changed files
with
39 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
[Innehåll](README.md) | ||
|
||
# Git | ||
|
||
## Konfliktlösning - merge | ||
|
||
### Status just nu | ||
*Tabell över ändringar som gjorts i två olika branches:* | ||
|
||
|Anns branch |Zekes branch |Resultat | | ||
|---------------|---------------|----------| | ||
|script.js | |script.js | | ||
| |book.css |book.css | | ||
|index.html (1) |index.html (2) |**MERGE** | | ||
|
||
Git försöker lösa alla sammanslagningar automatiskt. Men det är inte alltid det lyckas. | ||
|
||
Filerna `script.js` och `book.css` löser git självt. | ||
|
||
Men eftersom Ann och Zeke har gjort ändringar i samma fil, `index.html`, så behöver Git vår hjälp! | ||
|
||
(Fortsättning följer) |
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,12 @@ | ||
[Innehåll](README.md) | ||
|
||
TODO: | ||
+ ladda upp lokalt repo till GitHub | ||
+ klona ner ett projekt | ||
+ (se commit-historik) | ||
+ (ändra en fil online) | ||
+ hur man bidrar med pull requests | ||
|
||
```bash | ||
git remote add origin https://github.com/your-user-name/your-repo-name.git | ||
``` |