search

trongate / trongate-framework

The Trongate PHP framework
https://trongate.io
Other
1.12k stars 100 forks source link

dev branch is 439 commits behind master. #181

Closed iamprogrammerlk closed 4 months ago

iamprogrammerlk commented 4 months ago

Hey guys,

I would like to join the party.. but I'm a little confused. you guys are directly contributing to the master branch which the dev branch left hanging... 439 commits behind the master.

I always like to develop in my local(porked) dev branch and then push(via pull request) to the original dev(upstream) branch. then project owners will create a pull request to the main branch if the code review processes passed, master in this case. That makes the main branch much clearer, production-ready, and safer.

I think that also makes the codebase more easy to navigate and organize. most importantly review the code.

so can you give me the direction guide on which path I should take to be part of this... should I create PR to the master branch or dev branch?

PS: I think a messy codebase(git repository) is a real issue. that's why I created this matter as an issue.

@trongate

iamprogrammerlk commented 4 months ago

@trongate

Suggested fix

Run these in your git repository to update the dev branch. assuming origin is your remote alias,

Pulling all changes from master to temporary local branch

git pull origin master:sync-master-to-dev-branch

Pushing all changes from the temporary branch to the dev branch

git push origin sync-master-to-dev-branch:dev

Switching back to your master branch

git checkout master