Sauter Git Workflow : FAQs

• I want to commit my changes, but everytime I get an error like the following:

  

--> You have forgot to stage your changes before committing them

• I have committed my changes but no one else can get my changes:
  --> You have forgot to push your changes back to the server.
  Note: Committing a file only checks it into (VSS language) your local repository. To make it public on the server, you need to push the branch with these changed files, too.

• I want to push my committed changes to the server, but everytime I get an error like the following:

  

--> There are some changes made by other users in your branch. You need to pull it first.

• Is it possible to merge binary files?
  --> No, there is no way to merge binaries.
  Note: Access databases (mdb-files) are also treated as binaries!
  MS-Word and -Excel-documents are possible to merge, but its difficult

• Is it possible to lock individual branches on the server (e.g. the master-branch)?
  --> No, Git(hub) has no possibility to lock individual branches on the server.
  Git only allows you to set UACL on a whole repository, not on parts of it.
  You can only lock some local branches (client side) using git hooks. In that case you will get an error like this if you try to commit changes to your local master branch:

  
  Disadvantage: Project managers should not have such hooks installed, because they need to change the master branch. Alternatively they can omit these checks using a special command line option.

• to be continued....