Skip to content

A simple Embedded Workbench integration for TortoiseGit users

Notifications You must be signed in to change notification settings

felipe-iar/ew-tortoise-integration

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

10 Commits
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

TortoiseGit integration for Embedded Workbench users

TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files over time. Files are stored in a local repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of “time machine”.

Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code.

Git is an open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Every Git clone is a full-fledged repository with complete history and full revision tracking capabilities, not dependent on network access or a central server. Branching and merging are fast and easy to do.

This article introduces how to use TortoiseGit with EWARM.

Typical project development workflow with Git

A git server contains the project repository which, in the Git jargon, is referred as origin. Each developer makes a local copy by cloning the origin to his PC and starts to perform incremental changes to the source code. Each change must be commited to the local repository. After the developer is finished with the modifications, he pushes the code back to the origin.

git-flow

If you need a general introduction to version control with Git, then we recommend two videos on YouTube: Tech Talk: Linus Torvalds on git (about design and differences to other VCS) and Tech Talk: Git (more technical). You can also read Pro Git book (multiple translations as well as downloadable versions available) , the section called “Git User Manual”, or the section called “Git Tutorial” which are a short introductions to the Git revision control system, explain the different approaches to version control, and how Git works (with a bunch of examples).

Setup

Examples

Starting from a local repository

For this example, let's create a project from scratch and make into a git repository within the IDE.

  • Select File >> New Workspace.
  • Select Project >> Create new project >> C >> main.
  • Save the project in a new empty folder (e.g., %USERPROFILE%\Documents\project).
  • Build the project (F7).
  • Save the workspace.
  • Select Tools >> Git init >> OK.
  • Select Tools >> Git generate ignore >> OK.
  • Select Tools >> Git commit, enter with Initial commit as the commit message, select All files >> Commit.

image

  • Use Tools >> Git log to check the repository status.

image

Starting from a remote repository

For this, let's use this repository, which contains a workspace, as an example on how to clone an existing repository from a Git server.

  • Select Tools >> Git clone.
  • Set URL to: https://github.com/felipe-iar/ew-tortoise-integration.
  • Click OK and Close the window.

image

  • Select File >> Open Workspace >> %USERPROFILE%\Documents\ew-tortoise-integration\project.eww.

Tips

  • Assign shortcuts for the most commonly used commands at Tools >> Options >> Key bindings >> Menu: Tools.
  • Modify or expand tortoisegit.toolitems with extra commands. The TortoiseGit documentation provides further reference in Appendix D.

About

A simple Embedded Workbench integration for TortoiseGit users

Resources

Stars

Watchers

Forks

Languages