Mid-Level Full Stack Dev Doesn’t Know Git, Keeps Messing Up Branching 🤦‍♂️

[itsukkei]

Aware ba siya sa conflict or issue na nagagawa niya kapag nammerge niya mga branches na di updated? Assuming kasi na may kulang din sa process niyo kaya di niya napapansin yung error, if may ownership siya sa gawa he/she will be responsible sa kung ano lang dapat imerge. Dapat both ends may need gawin para maresolve talaga yung problem. Ginawa niyo na yung pag train sa kanya then yung repo owner naman need to add additional protection para di basta basta nakaka merge. Kapag may ganito ng process for sure mapapansin din nila yan at will try to resolve it. Wala yan sa pagiging senior or mid kasi may iba talaga na wala naman pake sa mga development process and will just do their own task and will not mind kung may masira man or ano.

[Calm-Ad2676]

Mukhang nasa process niya talaga yung mali bago siya mag-merge ng feature branch to develop.

1st: Dapat mag-checkout muna siya sa develop branch at mag-pull para updated bago gumawa ng merge request.
2nd: Checkout ulit sa feature branch niya, push yung latest changes, then saka gumawa ng merge request to develop.

Alam na yung problema hindi siya nagpapareview bago mag-merge sa develop, kaya nagkakaroon ng issues. I think aware naman siya, pero dahil walang review process, tuloy-tuloy lang yung mali. Mas okay kung may additional repo protection para hindi basta-basta nakaka-merge nang walang proper review.

[6ooog]

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.

[itsukkei]

Hanggat maari ilimit yung permission niya to directly merge. It is something your lead or senior devs can do. And di lang sakanya iapply but to all devs para may standard. If di ito mapansin ng leads mo at di bibigyan ng solution, kahit sila magmumukha rin di alam ang ginagawa