mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-09-27 19:59:02 +00:00
ff8091bef2
Bumping the `OPENEDX_COMMON_VERSION` in the master branch usually creates a conflict when we merge the change in the nightly branch. To avoid this conflict, we add some logic to the `OPENEDX_COMMON_VERSION`. This change should be invisible for most users. This partially addresses issue #936.
187 B
187 B
- [Improvement] Do not hardcode
OPENEDX_COMMON_VERSION = master
in the nightly branch. This removes git conflicts whenever we bump the common version in the master branch. (by @regisb)