We are using Git with Alpha, IIS, 2 developers on this project, 1 Central Repository, 2 local development repositories, and using Git Extensions to Push/Pull from Central Repository.
Randomly we'd notice that something we tested and published was working, then it would stop working (revert back to the status of the component prior to the change), and then randomly start working again.
Yesterday I figured out what was causing the issue, now I'm wondering why and how to prevent this.
Developer A does a pull from the central repository to ensure he has all the latest changes, proceeds to make a change, pushes that change to the central repository, and deploys the change to production.
Developer B goes in after all of this is working, pulls from the Central repository, makes a change to a completely different component, pushes that change to the central repository and deploys the change to production.
At this point, the component developer B changed is correct, however the component developer A changed has lost the changes (reverted back to the prior state before the changes were made). Without doing anything else, Developer B opens the component Developer A changed, makes a minor change just to dirty the component, redeploys to live and the changes are back in live for both Developer A and Developer B changes.
My gut tells me that because we have the setting to deploy new or modified files only that something is causing an issue because even though I did a pull to get the other developers changes, when I deploy it overwrites those changes with my "older" version as if I never did a pull first. The dirty component/save trick addresses this but that's not a fail proof method to have to know every change another developer made, dirty those components, and then republish what they already published and is working.
1) Should we just take that setting off and deploy all files everytime? Don't see what the difference is here but have to ask the question
2) Should we be deploying differently somehow?
3) Has anyone else experienced this issue with Git and Alpha?
Randomly we'd notice that something we tested and published was working, then it would stop working (revert back to the status of the component prior to the change), and then randomly start working again.
Yesterday I figured out what was causing the issue, now I'm wondering why and how to prevent this.
Developer A does a pull from the central repository to ensure he has all the latest changes, proceeds to make a change, pushes that change to the central repository, and deploys the change to production.
Developer B goes in after all of this is working, pulls from the Central repository, makes a change to a completely different component, pushes that change to the central repository and deploys the change to production.
At this point, the component developer B changed is correct, however the component developer A changed has lost the changes (reverted back to the prior state before the changes were made). Without doing anything else, Developer B opens the component Developer A changed, makes a minor change just to dirty the component, redeploys to live and the changes are back in live for both Developer A and Developer B changes.
My gut tells me that because we have the setting to deploy new or modified files only that something is causing an issue because even though I did a pull to get the other developers changes, when I deploy it overwrites those changes with my "older" version as if I never did a pull first. The dirty component/save trick addresses this but that's not a fail proof method to have to know every change another developer made, dirty those components, and then republish what they already published and is working.
1) Should we just take that setting off and deploy all files everytime? Don't see what the difference is here but have to ask the question
2) Should we be deploying differently somehow?
3) Has anyone else experienced this issue with Git and Alpha?