File tree Expand file tree Collapse file tree 1 file changed +3
-1
lines changed
Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -73,6 +73,8 @@ function addAllUntracked () {
7373
7474function mergeChanges () {
7575
76+ importantLog " Checking for merge requirements from remote origin"
77+
7678 # Get the name of the current branch
7779 current_branch=$( git rev-parse --abbrev-ref HEAD)
7880
@@ -81,7 +83,7 @@ function mergeChanges () {
8183 behind_count=$( git rev-list --count ${current_branch} ..${current_branch} @{upstream})
8284
8385 # Check if the current branch is ahead of the remote branch
84- if [ $ahead_count -gt 0 ]; then
86+ if [ $ahead_count -ge 0 ]; then
8587 echo " Your current branch '$current_branch ' is ahead of its remote counterpart by $ahead_count commit(s)."
8688 echo " ... nothing to merge ..."
8789 elif [ $behind_count -gt 0 ]; then
You can’t perform that action at this time.
0 commit comments