@san-siva/gitsy 1.0.16 → 1.0.17

package/README.md

@@ -5,7 +5,7 @@ A set of bash utilities for managing Git repositories with ease. Provides user-f
 
 ## Documentation
 
-For complete documentation, usage examples, and detailed command reference, visit the [gitsy documentation website](https://gitsy-56895.web.app).
+For complete documentation, usage examples, and detailed command reference, visit the [gitsy documentation website](https://gitsy.santhoshsiva.dev).
 
 ## System Requirements
 
@@ -151,7 +151,7 @@ g-push
 g-diff -s main -t feature-branch
 ```
 
-For complete command documentation and advanced usage examples, visit the [gitsy documentation website](https://gitsy-56895.web.app).
+For complete command documentation and advanced usage examples, visit the [gitsy documentation website](https://gitsy.santhoshsiva.dev).
 
 ## Features
 
@@ -267,7 +267,7 @@ This project is licensed under the MIT License. See the LICENSE file for details
 
 **Santhosh Siva**
 - GitHub: [@san-siva](https://github.com/san-siva)
-- Documentation: [gitsy-56895.web.app](https://gitsy-56895.web.app)
+- Documentation: [gitsy.santhoshsiva.dev](https://gitsy.santhoshsiva.dev)
 
 ## Acknowledgments
 

package/bin/g-wr

@@ -210,10 +210,16 @@ remove_worktree() {
 
 	print_message "${BLUE}Removing worktree at ${NC}${worktree_path}${BLUE}...${NC}" $step_number
 
-	# Always try using git worktree remove first with --force flag
-	if git -c color.ui=always worktree remove --force "$worktree_path" 2>&1 | indent; then
+	local worktree_parent
+	worktree_parent=$(dirname "$worktree_path")
+
+	# Always try using git worktree remove first with --force --force to handle
+	# both uncommitted changes and untracked files
+	if git -c color.ui=always worktree remove --force --force "$worktree_path" 2>&1 | indent; then
 		# Verify the directory was actually removed
 		if [ ! -d "$worktree_path" ]; then
+			# Navigate to parent in case we were running from inside the removed worktree
+			cd "$worktree_parent" 2>/dev/null
 			print_message "${GREEN}Worktree removed successfully.${NC}" 0
 			return 0
 		fi
@@ -222,6 +228,8 @@ remove_worktree() {
 	# Fallback to rm -rf if git worktree remove failed
 	print_message "${PROMPT}Git worktree remove incomplete. Attempting manual removal...${NC}" 0
 	if rm -rf "$worktree_path" 2>&1 | indent; then
+		# Navigate to parent before pruning since the worktree directory no longer exists
+		cd "$worktree_parent" 2>/dev/null
 		# Also need to prune the worktree from git's records
 		git -c color.ui=always worktree prune 2>&1 | indent
 		# Verify the directory was actually removed

package/bin/utils

@@ -384,9 +384,15 @@ pull_changes() {
 	fi
 
 	print_message "${BLUE}Pulling changes from ${NC}remote/${target_branch}${BLUE}...${NC}" $step_number
-	if ! git -c color.ui=always pull origin "${target_branch}" 2>&1 | indent; then
+	git -c color.ui=always pull origin "${target_branch}" 2>&1 | indent
+	local pull_exit=${PIPESTATUS[0]}
+	if [ $pull_exit -ne 0 ]; then
 		print_message "" -1
-		print_message "${RED}Failed to pull changes from remote. [Fail]${NC}" -1
+		if git diff --name-only --diff-filter=U 2>/dev/null | grep -q .; then
+			print_message "${RED}Merge conflicts detected. Resolve conflicts and then commit. [Fail]${NC}" -1
+		else
+			print_message "${RED}Failed to pull changes from remote. [Fail]${NC}" -1
+		fi
 		exit 1
 	fi
 	print_message "${GREEN}Pulled changes from ${NC}remote/${target_branch} ${GREEN}successfully.${NC}"
@@ -473,10 +479,15 @@ navigate_to_dir() {
 	if [ -z "$dir" ]; then
 		return 1
 	fi
-	if pwd | grep -Fq "$dir"; then
+	local target
+	target=$(cd "$dir" 2>/dev/null && pwd)
+	if [ $? -ne 0 ]; then
+		return 1
+	fi
+	if [ "$(pwd)" = "$target" ]; then
 		return 0
 	fi
-	if ! cd "$dir" 2>/dev/null; then
+	if ! cd "$target" 2>/dev/null; then
 		return 1
 	fi
 	return 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@san-siva/gitsy",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "A set of bash utilities for managing Git repositories with ease",
   "keywords": [
     "git",