Versions Compared

Old Version 20

changes.mady.by.user Remi Bergsma

Saved on

compared with

New Version 21

changes.mady.by.user Remi Bergsma

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: clarify two origins

...

Note
titleImportant

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

Gotcha: working with two origin repositories

When using these tools and this way of working on Apache CloudStack keep in mind that you work with to two origins:

  1. git-wip-us.apache.org/repos/asf/cloudstack.git (read/write)
  2. and github.com/apache/cloudstack.git (read-only)

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 merge the PR again.

Release management for 4.6

...