Loading README.md +5 −6 Original line number Diff line number Diff line Loading @@ -122,7 +122,7 @@ it needs to be merged. ### Class 4 homework **Deadline**: XX. XXX 2025, 23:59 **Deadline**: 25. March 2025, 23:59 Resolving merge conflicts is fun, right? Let's do some of that. Loading @@ -130,8 +130,8 @@ We have an old outdated branch in this upstream repository that someone worked on long time ago. There are some valuable changes in there, while some content is likely outdated. **Task**: rebase `upstream/class4-hw-problem` against `upstream/main-oct-9`. Create a merge request against `upstream/main-oct-9` from your fork from branch **Task**: rebase `upstream/class4-hw-problem` against `upstream/main-mar-3`. Create a merge request against `upstream/main-mar-3` from your fork from branch `class4-hw-problem` with your proposal. You'll pass this HW once your MR is approved. Loading @@ -142,14 +142,13 @@ approved. - You have to create the merge request in this upstream repository. Merge requests in forks (origin remote) will be ignored. - Make sure the merge request complies with all the best practices from the class. - Hint: commit message may need some updating. (no need to worry about commit authorship) - Don't worry about who is the author of the commit. - After you're done with the rebase process, save your command history, especially all `git` binary invocations. Put the history in a new file `<UCO>_commands.txt` inside `class4_homework/` directory. Commit and push the file into the MR. If you are asked to change something, no need to account for these commands in the history file. - Tomas and Irina will review all upstream merge requests: you may be asked to - Tomas and Michal will review all upstream merge requests: you may be asked to correct something. ### Class 5 homework Loading class4_homework/.gitkeep 0 → 100644 +0 −0 Empty file added. Loading
README.md +5 −6 Original line number Diff line number Diff line Loading @@ -122,7 +122,7 @@ it needs to be merged. ### Class 4 homework **Deadline**: XX. XXX 2025, 23:59 **Deadline**: 25. March 2025, 23:59 Resolving merge conflicts is fun, right? Let's do some of that. Loading @@ -130,8 +130,8 @@ We have an old outdated branch in this upstream repository that someone worked on long time ago. There are some valuable changes in there, while some content is likely outdated. **Task**: rebase `upstream/class4-hw-problem` against `upstream/main-oct-9`. Create a merge request against `upstream/main-oct-9` from your fork from branch **Task**: rebase `upstream/class4-hw-problem` against `upstream/main-mar-3`. Create a merge request against `upstream/main-mar-3` from your fork from branch `class4-hw-problem` with your proposal. You'll pass this HW once your MR is approved. Loading @@ -142,14 +142,13 @@ approved. - You have to create the merge request in this upstream repository. Merge requests in forks (origin remote) will be ignored. - Make sure the merge request complies with all the best practices from the class. - Hint: commit message may need some updating. (no need to worry about commit authorship) - Don't worry about who is the author of the commit. - After you're done with the rebase process, save your command history, especially all `git` binary invocations. Put the history in a new file `<UCO>_commands.txt` inside `class4_homework/` directory. Commit and push the file into the MR. If you are asked to change something, no need to account for these commands in the history file. - Tomas and Irina will review all upstream merge requests: you may be asked to - Tomas and Michal will review all upstream merge requests: you may be asked to correct something. ### Class 5 homework Loading