解決遠端衝突

---

將剛剛合併好的 feature 推至遠端

git push origin feature

---

將剛剛合併好的 feature 推至遠端

git pull origin feature

---

將剛剛合併好的 feature 推至遠端

git push origin feature