Skip to content

Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl [frappe]

Bot Dokos requested to merge ft-commit-726fba61f348de into develop

From: https://github.com/frappe/erpnext/commit/726fba61f348de0bd3302a54bea36912f760063f
Date: 2023-10-17 15:59:16+05:30
By: Deepesh Garg

Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl

This is a commit that is not part of any pull request.


Diagnostics

pre-commit failed for source commit: d2096cfdb752bff03f8d3a00262d86c9eeb76c37
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

erpnext/setup/install.py:35:2: F821 undefined name 'hide_workspaces'
erpnext/setup/install.py:240:1: F811 redefinition of unused 'update_roles' from line 234


pre-commit failed for source commit: 6e3e4c8adeb2a3b9b8ead5a13e597f1eb33ef7f8
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

erpnext/setup/install.py:35:2: F821 undefined name 'hide_workspaces'
erpnext/setup/install.py:240:1: F811 redefinition of unused 'update_roles' from line 234
erpnext/setup/install.py:246:1: F811 redefinition of unused 'update_roles' from line 240


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-commit-726fba61f348de

# Make changes then rebase
git rebase -i upstream/develop --reapply-cherry-picks

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports