search

eclipse-arrowhead / core-java-spring

Eclipse Public License 2.0
26 stars 51 forks source link

Development into Ditto-integration #390

Closed misterabdullahAziz closed 2 years ago

misterabdullahAziz commented 2 years ago

We are merging the development branch into the ditto-integration branch.

rbocsi commented 2 years ago

@misterabdullahAziz Sorry, we have a misunderstanding. Svetlin did not ask this. You should do the following things:

  1. Close this PR.
  2. Checkout ditto-integration branch to your computer.
  3. Merge development branch into ditto-integration branch on YOUR computer, solving the merge conflicts.
  4. Commit and push the ditto-integration branch back to github.
  5. Create a pull request where you want to merge ditto-integration into development.
  6. After that we can review your code (without any merge confilict)

Thank you.