diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-13 01:30:54 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-13 01:30:54 +0200 |
| commit | a793aababd2b255dda42540715792167164e1e94 (patch) | |
| tree | 16be906cfaf2300839d6dfbdb744789c648c2828 /Software/Visual_Studio/MachineStudio | |
| parent | a63b5db93859fac695d1b9faea23b79e3a070179 (diff) | |
| parent | 283c4c55b62346772a5d1b48f4efc2504067cbfc (diff) | |
| download | Tango-a793aababd2b255dda42540715792167164e1e94.tar.gz Tango-a793aababd2b255dda42540715792167164e1e94.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs index 25c81fcf4..eeafa513f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs @@ -286,7 +286,7 @@ namespace Tango.MachineStudio.Common.Publish if (Options.AutoCommitAndPush) { OnPublishProgress(0, 100, "Pushing repository changes..."); - git.Push(); + git.Sync(); } else { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 716b31a27..4f9bee934 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.2.5.0")] +[assembly: AssemblyVersion("4.2.6.0")] [assembly: ComVisible(false)]
\ No newline at end of file |