Try rebase. If that dissolves into conflict-resolution-hell then give up, merge master into your branch and move on.”
~ Tim Abell
Should you rebase or merge to update feature branches in git?
解决 Magento 2 应用问题,更注重深度挖掘。(ง •̀_•́)ง
Try rebase. If that dissolves into conflict-resolution-hell then give up, merge master into your branch and move on.”
~ Tim Abell
Should you rebase or merge to update feature branches in git?