d4ac68423c
After some discussion with "iamakulov" on Twitter it seems that the use of the word "conflicts" and "merge conflicts" here was sounding like us implicitly condoning the use of version control as a mechanism for distributing local state files, which hasn't been recommended for quite some time since remote state now provides a much more robust solution. While here, I also tweaked some other language on this page for style and for use of terminology we more commonly use in our more recent documentation. |
||
|---|---|---|
| .. | ||
| backends | ||
| commands | ||
| configuration | ||
| import | ||
| internals | ||
| modules | ||
| plugins | ||
| providers | ||
| provisioners | ||
| registry | ||
| state | ||
| index.html.markdown | ||