search

Esri / developer-support

Proof of concept developer code and samples to help be successful with all ArcGIS developer products (Python, NET, JavaScript, Android…). The repository is designed to be an exchange for sharing coding conventions and wisdom to developers at all skill levels.
Apache License 2.0
266 stars 164 forks source link

update oblique viewer in gh-pages #241

Closed andr7430 closed 8 years ago

andr7430 commented 8 years ago

update oblique viewer in gh-pages

jgravois commented 8 years ago

@andr7430 @goldenlimit

i think its a lot better idea to fast-forward gh-pages to keep it in sync with master than to start pushing commits for a single sample to both branches manually.

  1. submit Pull Request to master with new sample
  2. review/merge
  3. pull down latest
  4. merge into gh-pages (this should be a fast forward)
  5. push upstream

let me know if you have any questions.

andr7430 commented 8 years ago

gotcha. Should there be a pull request when pushing upstream gh-pages?

jgravois commented 8 years ago

no. as long as you never lay down commits of your own in either branch, after a new sample has been code reviewed and merged into master via a Pull Request it is safe to merge locally and push gh-pages directly upstream to keep the two branches in sync.