search

delta-cs / seminar-domjudge

DOMjudge programming contest jury system
https://www.domjudge.org
GNU General Public License v2.0
2 stars 0 forks source link

Rebase our fork onto 8.2.3 #135

Closed zapotocnylubos closed 1 month ago

zapotocnylubos commented 3 months ago

Our fork is based on 8.2.1, current upstream stable version is 8.2.3.

better to upgrade now, than later. It will also help us to apply some changes upstream in the future.

zapotocnylubos commented 1 month ago

@matous-volf can you have a look at https://github.com/delta-cs/seminar-domjudge/tree/8.2.3

I created new branch, that is based on the upstream tag (https://github.com/DOMjudge/domjudge/releases/tag/8.2.3)

Reminder: since upstream does not create versioned branches, we have our branch created from their commit corresponding to that tag

I then rebased our branch "8.2.1", which we used as a main branch (since main branch contains the latest changes that are not production-ready yet), and renamed/created a new branch 8.2.3 in our repo.

Snímek obrazovky 2024-06-14 v 10 35 44

Having HEAD of our 8.2.3 at the latest changes we made at cbdc007 but it has s different hash, since its a readme, that needed to have a merge conflict resolved. (it's because we have our subversion of the main version like 8.2.3-0.3.1)

Snímek obrazovky 2024-06-14 v 10 37 45
matous-volf commented 1 month ago

lgtm :+1: