[Misc] fix collect_env version parse

Signed-off-by: wangxiyuan <[email protected]>

Author: wangxiyuan

vllm/collect_env.py

@@ -282,11 +282,26 @@ def get_vllm_version():
 
     if __version__ == "dev":
         return "N/A (dev)"
+<<<<<<< HEAD:vllm/collect_env.py
 
     if len(__version_tuple__) == 4:  # dev build
         git_sha = __version_tuple__[-1][1:]  # type: ignore
         return f"{__version__} (git sha: {git_sha}"
 
+=======
+    version_str = __version_tuple__[-1]
+    if isinstance(version_str, str) and version_str.startswith('g'):
+        # it's a dev build
+        if '.' in version_str:
+            # it's a dev build containing local changes
+            git_sha = version_str.split('.')[0][1:]
+            date = version_str.split('.')[-1][1:]
+            return f"{__version__} (git sha: {git_sha}, date: {date})"
+        else:
+            # it's a dev build without local changes
+            git_sha = version_str[1:]  # type: ignore
+            return f"{__version__} (git sha: {git_sha})"
+>>>>>>> 3739f1e96 ([Misc] fix collect_env version parse):collect_env.py
     return __version__