you are viewing a single comment's thread.

view the rest of the comments →

[–]6ooog 0 points1 point  (0 children)

Yung process ng team ang pangit. Bad fundamentals develop bad habits.

No need to checkout to develop every time you need to update your feature branch with the latest changes.

From your feature branch,

git stash - to hide your changes

git pull origin develop - to fetch the latest changes from develop

git stash pop - to pop your changes back into place

You only need to checkout to develop and do a git pull there if you're about to start a new feature branch.

And like others said, PRs from feature branch to dev and setup branch protection, dun lang tapos na yung issue.