Search found 2 matches

by MatrixDee
Thu Nov 19, 2020 10:26 am
Forum: Source Control
Topic: Git: Lock all edits on a branch
Replies: 0
Views: 1323

Git: Lock all edits on a branch

We are using Git with Azure Devops, Flare 2019r2. In Azure Devops, I have a policy preventing commits to master. You have to go through a pull request to merge from a feature branch to master. However, we frequently run into trouble when we checkout master in order to run the build, then forget we'r...
by MatrixDee
Wed Oct 19, 2016 7:58 am
Forum: Source Control
Topic: Flare 12, GIT, and importing
Replies: 7
Views: 7689

Re: Flare 12, GIT, and importing

Thanks everyone, this thread has been very helpful! Regarding the GitHub workflow: We don't work directly in the Master branch. We want Master to always be safe to publish from, so anything in Master is complete and publication-ready. This means that we can't have in-progress work in the Master bran...