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.

Sign up for GitHub

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

Jump to bottom

Added Chronogram and Demand View Table - 75 #23

Merged
merged 22 commits into from
Oct 5, 2023
Merged

Added Chronogram and Demand View Table - 75 #23

merged 22 commits into from
Oct 5, 2023

Conversation

Bailonis
Copy link
Contributor

In this PR we added a Chronogram and Demand View Table where we can see everything related with a capacity group, in their details page

@Bailonis Bailonis requested review from Ruskyy and carslen September 19, 2023 10:21
@Bailonis Bailonis changed the title Added Chronogram and Demand View Table Added Chronogram and Demand View Table - 75 Sep 19, 2023
@carslen
Copy link
Contributor

carslen commented Sep 25, 2023

@Bailonis please resolve merge conflicts

@Bailonis
Copy link
Contributor Author

@carslen Resolved

@carslen
Copy link
Contributor

carslen commented Sep 26, 2023

Again conflicting file FavoriteServiceImpl.java, please resolve merge conflict.

@Bailonis
Copy link
Contributor Author

Hi there @carslen i have done this to this pr:
image

changed the 53 to 75, this due to I can't resolve this confict:

image

@carslen
Copy link
Contributor

carslen commented Oct 4, 2023

Hm, the list of conflicts is increasing instead of decreasing. Please try to resolve. I cannot as I cannot asses the changes. I'm sorry, but we have to go through this merge hell. Also #26 and #28 are affected.

@Bailonis
Copy link
Contributor Author

Bailonis commented Oct 4, 2023

@carslen I will try but i cannot see the merge conflicts, and that does not help the process

@Bailonis
Copy link
Contributor Author

Bailonis commented Oct 4, 2023

@carslen no more merge conflicts on this branch

@Diogo12246
Copy link
Contributor

Nice.

@carslen carslen merged commit 84b1a45 into eclipse-tractusx:main Oct 5, 2023
3 checks passed
@carslen carslen deleted the feature/DCMFOSS-75 branch October 5, 2023 07:41
SebastianBezold pushed a commit that referenced this pull request Jan 31, 2024
@Ruskyy
Merge pull request #23 from catenax-ng/feature/DCMFOSS-70-frontend
9e1ada1 
Feature/dcmfoss 70 frontend
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ruskyy Ruskyy Awaiting requested review from Ruskyy

@carslen carslen Awaiting requested review from carslen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Bailonis @carslen @Diogo12246 @Ruskyy