VOL-4840 - Tracking ticket for release documentation

conf.py
-------
  o Define more external link macros to shorten URLs.

Misc
----
  o Re-create patch Ifa5009e78f85944c9b6ce2991bed86ae852fcd4b
     to re-sync with master -vs- resovle server merge conflicts.
  o Bulk copyright update.
  o Update more released version strings in the component dependency grid.

Change-Id: I71b7cfbaa3f52191d28e1d2164784e6ffaad86a1
diff --git a/howto/release/components/voltha-lib-go.rst b/howto/release/components/voltha-lib-go.rst
index da1b057..8785b06 100644
--- a/howto/release/components/voltha-lib-go.rst
+++ b/howto/release/components/voltha-lib-go.rst
@@ -20,6 +20,27 @@
 Release
 -------
 
+<<<<<<< HEAD
 - Bump VERSION file to a non-dev semantic version.
 - See Validate above
 - Commit and approve to trigger a build
+=======
+<<<<<<< HEAD
+- Bump VERSION file to a non-dev semantic version.
+- See Validate above
+- Commit and approve to trigger a build
+=======
+- Bump /opencord/ component versions in go.mod
+- make distclean
+- make mod-update
+- Review and commit changes.
+- make lint-mod
+- When ready to release a new component version of voltha-lib-go
+
+  - Bump VERSION file to a non-dev semantic version.
+
+- Commit changes and create a pull request.
+- Once approved a jenkins job will launch.
+
+>>>>>>> cb4f2e0 (VOL-4840 - Tracking ticket for release documentation.)
+>>>>>>> f854950 (VOL-4840 - Tracking ticket for release documentation.)