Updated WFS and WPS sections but there are .DS_Store conflicts

[ghobona]

The .DS_Store conflicts need to be resolved to merge into the master branch

[serich]

Gobe & Luis - A couple questions:

1. Am I causing these conflicts? 
2. If so, do you know how I can avoid causing them in the future? 
3. Either way, is there anything I need to do in my local cloned copy of the e-learning repo (particularly the WMTS folder) to clean it up too? 

Thanks.

From: "GitHub Notifications" notifications@github.com To: "opengeospatial/e-learning" e-learning@noreply.github.com Cc: "Subscribed" subscribed@noreply.github.com Sent: Friday, September 29, 2017 5:09:58 AM Subject: [opengeospatial/e-learning] Updated WFS and WPS sections but there are .DS_Store conflicts (#39)

The .DS_Store conflicts need to be resolved to merge into the master branch You can view, comment on, or merge this pull request online at:

[ https://github.com/opengeospatial/e-learning/pull/39 | https://github.com/opengeospatial/e-learning/pull/39 ] Commit Summary

* Updates to WFS and WPS sections 
* Delete .DS_Store 
* Delete .DS_Store 
* Delete .DS_Store 
* Delete .DS_Store 
* Delete .DS_Store 
* Delete .DS_Store 
* Delete .DS_Store 
* Delete .DS_Store 
* Delete .DS_Store 
* Delete .DS_Store 

File Changes

* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-0 | .DS_Store ] (0) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-1 | source/.DS_Store ] (0) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-2 | source/geopackage/.DS_Store ] (0) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-3 | source/geopackage/img/.DS_Store ] (0) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-4 | source/geopackage/text/.DS_Store ] (0) 
* M [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-5 | source/index.rst ] (2) 
* A [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-6 | source/processing/basic-index.rst ] (10) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-7 | source/wfs/.DS_Store ] (0) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-8 | source/wfs/text/.DS_Store ] (0) 
* M [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-9 | source/wfs/text/basic-main.rst ] (19) 
* M [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-10 | source/wfs/text/basic-overview.rst ] (2) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-11 | source/wfs/text/index.rst ] (10) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-12 | source/wfs/text/main.rst ] (53) 
* M [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-13 | source/wfs/text/operations.rst ] (262) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-14 | source/wfs/text/overview.rst ] (30) 
* A [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-15 | source/wps/img/workflow.png ] (0) 
* A [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-16 | source/wps/text/basic-index.rst ] (10) 
* A [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-17 | source/wps/text/basic-main.rst ] (122) 
* A [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-18 | source/wps/text/basic-overview.rst ] (27) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-19 | source/wps/text/index.rst ] (10) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-20 | source/wps/text/main.rst ] (53) 
* A [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-21 | source/wps/text/operations.rst ] (479) 
* D [ https://github.com/opengeospatial/e-learning/pull/39/files#diff-22 | source/wps/text/overview.rst ] (30) 

Patch Links:

* [ https://github.com/opengeospatial/e-learning/pull/39.patch | https://github.com/opengeospatial/e-learning/pull/39.patch ] 
* [ https://github.com/opengeospatial/e-learning/pull/39.diff | https://github.com/opengeospatial/e-learning/pull/39.diff ] 

— You are receiving this because you are subscribed to this thread. Reply to this email directly, [ https://github.com/opengeospatial/e-learning/pull/39 | view it on GitHub ] , or [ https://github.com/notifications/unsubscribe-auth/AGdSRaUbF_lHZ8GYcFdoV3xx6gebiZmgks5snLPmgaJpZM4PoZii | mute the thread ] .

[bermud]

I updated .gitignore to ignore the .DS_Store files. I merged the PR

[serich]

Cool... thanks.