Versions Compared

Old Version 18

changes.mady.by.user Remi Bergsma

Saved on

compared with

New Version 19

changes.mady.by.user Daan

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: out of sync origins

...

Note
titleImportant

We should all use the same tools to merge pull requests and do forward merges!

Gotcha

When using these tools and this way of working on Apache CloudStack keep in mind that you work with to origins: git-wip-us.apache.org/repos/asf/cloudstack.git and github.com/apache/cloudstack.git

If you merge on a clone of one of them while it is behind on the other (or with its origin) you are merging on a commit that is no longer a HEAD. You will get an error when you push due to conflicts. At this point it is safest to throw away your merge, update (git fetch) you local clones and reapply the PR.

Release management for 4.6

...