def post(self, request, *args, **kwargs): message = models.git_fetch(settings.GIT_REMOTE) self.echo(message) models.git_checkout(settings.GIT_LOCAL_FETCHED) message = models.git_merge(settings.GIT_REMOTE_BRANCH) self.echo(message) context = self.get_context_data(message=message) return self.render_to_response(context)
def post(self, request, *args, **kwargs): models.resolve_errors() models.git_checkout(settings.GIT_LOCAL_BRANCH) message = models.git_merge(settings.GIT_LOCAL_FETCHED) self.echo(message) models.git_checkout(settings.GIT_LOCAL_FETCHED) context = self.get_context_data(message=message) return self.render_to_response(context)