https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386
Victor Grousset/tuxayo <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)|21.05.00,20.11.07 |21.05.00,20.11.07,20.05.13 released in| | Status|Pushed to oldstable |Pushed to oldoldstable --- Comment #47 from Victor Grousset/tuxayo <[email protected]> --- Backported: Pushed to 20.05.x branch for 20.05.13 After around 130 conflicts! (How did Frido, Kyle and Nick dealt with this?) Hint in case Wainui gets the same thing: Solve the individual conflicts as usual. When getting a 60 conflicts pack, just rapidly skim through then without solving to confirm that it will be safe to do `git checkout --theirs MY_FILE` It was safe in my case (noticed after manually solving the 60 ones...) There is another 60 conflicts pack, do the same as above. The timeline in the about page isn't broken, so that seems to work ^^ and Jonathan told me that we should keep the commit numbers from upstream, not the one from our branch. And it's not used anyway. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
