Changes necessary for JDime wrapper script
To retrieve the information about the number of conflicts, a merge now returns the number of conflicted files instead of a Status object.
Slurm: We now have two new dedicated login nodes freia and frigga that can be used directly to submit Slurm jobs. Jumping via merci/snickers and connecting to a workstation is no longer necessary. Logging in to workstations might be disabled for non-staff users at some point in the future. Documentation
If something does not (yet) work as expected, please let us know.
To retrieve the information about the number of conflicts, a merge now returns the number of conflicted files instead of a Status object.