Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define a git workflow to integrate new features. #35

Closed
SimonKrafft opened this issue Mar 10, 2024 · 2 comments
Closed

Define a git workflow to integrate new features. #35

SimonKrafft opened this issue Mar 10, 2024 · 2 comments
Assignees

Comments

@SimonKrafft
Copy link
Contributor

We have to determine, how we want to collaborate in the future and how we separate production code from development code.

I would propose git-flow as a branching strategy, which adds a long-running "develop" branch to the "main" branch. New features or testing phases are third-level branches that shadow the "develop" branch.

Image
from: https://www.youtube.com/watch?v=Uszj_k0DGsg

@mehran-hosseinzadeh
Copy link
Contributor

define a develop branch and pull that by all

@SimonKrafft
Copy link
Contributor Author

As discussed in today's meeting, we will stick to GitFlow as our branching strategy. Therefore, I added a 'develop' branch to the MedicalAnnotationFramework and the media_viewing_widget repo.
@FreshP-min and @mehran-hosseinzadeh, please pull the most recent commits from the develop branch before you start implementing new features and fixing bugs.
@Valaybundele you can now push your latest changes on #39 and #40 into the develop branch, but remember to update your git remote with 'git remote set-url origin [email protected]:cgtuebingen/MedicalAnnotationFramework.git' and pull before you push.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants