Skip to content

Sauter Git Workflow : FAQs

engerwol edited this page Oct 18, 2013 · 13 revisions
  • I want to commit my changes, but everytime I get an error like the following:

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

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

    Forgot To Pull
    --> 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

  • 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 must also push the branch with these changed files.

  • to be continued....