-
Notifications
You must be signed in to change notification settings - Fork 8
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are conflicts when merging this branch. Please resolve this locally and then push this upstream.
You can either rebase (preferred), or manually merge.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One small change requested, and the commit has to be rebased too. If you don't know how, we can do this at the labwork too.
pom.xml
Outdated
@@ -30,7 +30,7 @@ | |||
<logback.version>1.1.11</logback.version> | |||
<selenium.version>3.0.0</selenium.version> | |||
<build.server.version>1.2.0</build.server.version> | |||
<git.server.version>1.0.10</git.server.version> | |||
<git.server.version>1.0.11-SNAPSHOT</git.server.version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually this should only change in your feature branch, and not in this commit. Can you undo this change here?
@jwgmeligmeyling I changed that back, do I still need to rebase? |
Thanks! Yes it has still to be rebased, as there are merge conflicts with the master branch (other students pushed to the contributors section of the POM-file too) |
No description provided.