tomasr/Nix-Git-Cherry-Picker
1
0
Fork 0
mirror of https://github.com/tomasriveral/Nix-Git-Cherry-Picker.git synced 2026-08-12 10:40:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

ngcp pull: abort if merge conflict during automatic

Browse Source
This commit is contained in:
tomasr
2026-06-08 16:26:56 +02:00
parent 8e68a8473c
commit 785b747ebc
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ngcp.sh
+8 -1
View File
@@ -63,7 +63,14 @@ if [[ "$1" == "pick" ]]; then
git -C "$nixConfigPath" checkout -b "$remoteBranch" "origin/$remoteBranch" git -C "$nixConfigPath" checkout -b "$remoteBranch" "origin/$remoteBranch"
fi fi
echo "Pulling latest commits before cherry-picking..." echo "Pulling latest commits before cherry-picking..."
if ! git -C "$nixConfigPath" pull --rebase ; then if git -C "$nixConfigPath" pull --rebase ; then
echo "Pull successful."
elif (( automatic )); then
echo "Merge conflict detected during pull. Please run ngcp pull manually"
notify-send "Merge conflict detected during ngcp pull." "Please run ngcp pull manually"
git -C "$nixConfigPath" rebase --abort
exit 1
else
echo "Merge conflict detected during pull." echo "Merge conflict detected during pull."
echo "Resolve conflicts and run:" echo "Resolve conflicts and run:"
echo " git rebase --continue" echo " git rebase --continue"