Add repo merge in update function

ColinTalbert · May 14, 2018 · 315b8b9 · 315b8b9
1 parent bc92245
commit 315b8b9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pymdwizard/gui/MainWindow.py b/pymdwizard/gui/MainWindow.py
@@ -1169,6 +1169,8 @@ def update_from_github(self):
             fetch = [r for r in repo.remotes if r.name == 'usgs_root'][0].fetch()
             master = [f for f in fetch if f.name == 'usgs_root/master'][0]
 
+            merge_msg = repo.git.merge(master.name)
+
             msg = 'Updated Successfully from GitHub.'
             QMessageBox.information(self, "Update results", msg)
         except BaseException as e: