-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
18 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,18 @@ | ||
from ..issues import execute | ||
|
||
def Pull(remote, branch): | ||
execute([f'git pull {remote} {branch}']) | ||
if not Status(): | ||
execute([f'git pull {remote} {branch}']) | ||
else: | ||
execute([f'git diff --stat']) | ||
print( | ||
f'\nTheres some changes in branch {br(current_branch)}.') | ||
qs = [f'Commit changes of branch {br(current_branch)}'] | ||
qs.append(f'Stash changes of branch {br(current_branch)} ') | ||
answer = getAnswer(qs) | ||
if answer == 1: | ||
execute([f'git add .', f'git diff --stat']) | ||
Commit() | ||
elif answer == 2: | ||
execute([f'git stash']) | ||
execute([f'git pull {remote} {branch}']) |