cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rajani Karuturi <raj...@apache.org>
Subject [DOC] cloudstack-docs-admin git merge strategy
Date Wed, 10 Sep 2014 07:04:31 GMT
While fixing a doc issue, I added *.po and *.mo files to the merge ignore
list(see .gitattributes file) and merged from 4.3 to 4.4 to master.

If we could follow this, it would be really helpful.
Basically, fix in the lowest possible version and merge upwards. The merges
would be very trivial as they would most likely be your change only.

Please let me know if you see any issues with this.

$ git branch --contains fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618
  4.3
  4.4
* master

peace :)


~Rajani

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message