I did some changes in .scss file and .xml file in my development branch which I cloned from staging, but when I tried to drag it and drop it to the staging branch to merge them, I get an error message saying "There are no any changes to merge", Please I need some help to solve this matter.
Odoo is the world's easiest all-in-one management software.
It includes hundreds of business apps:
- CRM
- e-Commerce
- Accounting
- Inventory
- PoS
- Project management
- MRP
This question has been flagged
1
Reply
1537
Views
Hi, this means you have already same changes on staging or you haven't properly committed changes on development branch.
odoo.sh drop branch to merge do exact same as you create pull request and merge in GitHub. So you can compare your development branch with staging on GitHub to check difference.
Enjoying the discussion? Don't just read, join in!
Create an account today to enjoy exclusive features and engage with our awesome community!
Sign up