diff --git a/git_assistant/git_tools/git_more.py b/git_assistant/git_tools/git_more.py index 48d0e152e1827c4a4c4ec7709994b75e1239fc85..8310ae921b70c2d802e095fcf04ce999b30a439e 100644 --- a/git_assistant/git_tools/git_more.py +++ b/git_assistant/git_tools/git_more.py @@ -63,10 +63,20 @@ def git_review(): steps. You can learn more in the documentation and you should. """ + message5 = """ + While Git push allows you to publish local commits on a remote server, the + git pull command lets you update the local version with the new commits + saved on the remote server. It is the most common way to update a repository + and you should use it everytime that you interact with the remote server.\n + Note that this tutorial does not include how to git pull although it is being + considered for future versions. If you need to git pull, we recommend to + consult the documentation available in the repository and the program. + """ + # Creating window root = tk.Tk() root.title("Review of Git") - root.geometry("250x250") + root.geometry("250x280") root.config(background = "#F5F5F5") root.eval('tk::PlaceWindow . center') label = tk.Label(root, text ="Select an option and\n review some concepts") @@ -125,6 +135,16 @@ def git_review(): title = tk.Label(window_4, text ="\n\nGit push and the previous steps", bg= "#F5F5F5").pack() text = tk.Label(window_4, text =message4, bg= "#F5F5F5", anchor="e", justify="left", width=100).pack() return + + def open_window_5(): + + window_5 = tk.Toplevel(root) + window_5.title("git pull") + window_5.geometry("530x250") + window_5.config(background = "#F5F5F5") + title = tk.Label(window_5, text ="\n\nWhat does a git pull do?", bg= "#F5F5F5").pack() + text = tk.Label(window_5, text =message5, bg= "#F5F5F5", anchor="e", justify="left", width=100).pack() + return # Buttons that open windows and destroy the root window. @@ -142,6 +162,9 @@ def git_review(): button_4 = tk.Button(root, text= "git add/git commit/git push", bg="#B0E0E6", command=open_window_4) button_4.pack(side="top") + + button_5 = tk.Button(root, text= "git pull", bg="#B0E0E6", command=open_window_5) + button_5.pack(side="top") button_done = tk.Button(root, text = "Done", bg="#FF6347", command=root.destroy) button_done.pack(side="bottom")