Skip to content

Conversation

Matthias-Schaub
Copy link
Contributor

No description provided.

@Hagellach37 Hagellach37 changed the base branch from dev to completeness May 20, 2020 14:12
@Hagellach37 Hagellach37 changed the base branch from completeness to dev May 20, 2020 14:12
matthias_schaub and others added 2 commits May 21, 2020 15:03
@Hagellach37
Copy link
Member

Hey @Matthias-Schaub ,
this looks good. I was struggling how to get these changes and the changes in the completeness branch together. I ended up copying most of your work and committing it into the completness branch.

Not sure if this was the best way to do it. 25ff666

What would be the best way to go on now? merge this into dev first and then the completeness branch? or double checking if these changes here in are correctly implemented in completness?

@Matthias-Schaub
Copy link
Contributor Author

Hello @Hagellach37,

I would merge this pull request first, because it changes the underlying structur/names of project type classes.

After that one could merge from dev into completness and resolve conflicts there.

I imaging a lot of conflicts if one manuelly copies changes from one branch to another and then merges them. Git will not recognise same code lines and mark everything as conflict.

I could try to sort it out.

@Matthias-Schaub Matthias-Schaub merged commit bbc57a6 into dev May 24, 2020
@Hagellach37 Hagellach37 mentioned this pull request Jun 2, 2020
Merged
@Hagellach37 Hagellach37 deleted the project_types branch March 3, 2021 13:38
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

Successfully merging this pull request may close these issues.

2 participants