Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b feature/#31_modificar_modelo_edicto origin/feature/#31_modificar_modelo_edicto
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout develop git merge --no-ff feature/#31_modificar_modelo_edicto
Step 4. Push the result of the merge to GitLab
git push origin develop
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines
The changes were not merged into develop.
mixins.ListModelMixin, | ||
viewsets.GenericViewSet): | ||
queryset = Edicto.objects.all().order_by('id') | ||
serializer_class = EdictoSerializer | ||
permission_classes = [IsAuthenticated, ] | ||
filter_backends = (DjangoFilterBackend, filters.OrderingFilter) | ||
filterset_class = EdictoFilter | ||
queryset = Edicto.objects.all().order_by('id') | ||
|
Status changed to closed