跳至內容
選單
此問題已被標幟
1 回覆
2192 瀏覽次數

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. 

頭像
捨棄
最佳答案

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.

頭像
捨棄