GIT not working as "I" expect
First, I realize this is a problem with me, not GIT or PyCharm. However:: Clarification would be greatly appreciated!
I am running a shared project via drop box. Where I want it to be the master / Stable release.
I want to work on feature updates without modifying the master, until I have the features working, or I haven't totally broken something that is working.
however, when I create a branch, the branch modifies what everyone else has access to. (actually, what ever I have checked out modifies what everybody has access to.)
Everybody else should only have access to the Stable master. BTW, everybody else is just Running the python Script via Python directly, not with PyCharm
Any Help on this would be great! otherwise, I have to only work on the code when nobody else wants to use it... and I have to remember to checkout the master when I pause my work.
Thank you and Best Regards,
Christopher Lund old Guy new to programming...
Please sign in to leave a comment.
The issue here appears to be the sharing via dropbox. Dropbox syncs the git repo and git working copy state to all others. This seems to be a fundamentally wrong workflow. Git offers other tools for collaboration.
Being a Distributed VCS, Git assumes you work in your local clone. So first, you need one central repository that all team members have access to.
Then, each developer should CLONE the repository locally, and make work in the local clone. There one could work on any branch and do any change.
Then, when finished, changes should be merged e.g. to master and pushed to the central repo.
See https://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows
I am the only developer, and the only one using GIT.
The intent to use dropbox is for the stable version for Users. I want to Use GIT to branch for feature updates.
As I understand it, Dropbox Copies all the data, so in that sense, I am working on Local data.
As I understood from your initial description, the issue is that the code in dropbox changes every time you checkout a branch. This is expected since dropbox syncs every file change. You need to avoid this if you want others to have access to master while you are working on a branch.
The only way to avoid this is not syncing your working copy automatically. Instead, you could manually upload files you want your users to see to dropbox, or maybe you could checkout master as a separate project (using git worktree), and sync that project.