search

zaviagodev / frappe

MIT License
0 stars 1 forks source link

Merge Branch in Frappe Repo to Main and Update App.hosting.zaviago.com #194

Closed John-zaviago closed 5 months ago

John-zaviago commented 5 months ago

Task: Merge Branch in Frappe Repo to Main and Update App.hosting.zaviago.com

Task List:

  1. Merge the Mark CSS branch in the Frappe repository to the main branch.
  2. Update the master version of the Frappe app on Apps.hosting.zaviago.com to reflect the changes.

Implementation Steps:

  1. Access the Frappe repository and navigate to the specified branch.
  2. Perform a merge of the specified branch into the main branch.
  3. Resolve any merge conflicts if they arise during the merging process.
  4. Push the changes to the main branch in the Frappe repository.
  5. Update the master version of the Frappe app on App.hosting.zaviago.com to synchronize with the latest changes.

Expected Outcome: The specified branch changes should be successfully merged into the main branch in the Frappe repository. Additionally, the master version of the Frappe app on App.hosting.zaviago.com should be updated to reflect the merged changes.

Additional Information: Ensure that any potential conflicts during the merge process are addressed appropriately to maintain code integrity.

deviljutt commented 5 months ago

This is done

Image

John-zaviago commented 5 months ago

Seem to be done and fixed the css issues.