osx - Problems SourceTree listing files in local repository as deleted -

-

We have two developers working on a large project that includes 30 small satellite web sites from two different stations. We have been facing problems with SOURCATRI in this fact that sometimes many files have been destroyed in the "Change of work copy" field in OSX station and requires reques

A The main issue:

Have been. But when we check that the files are still present in the Mac's project folder, then they are still there.

  • We can not drag the file until we will not make any further changes, ignoring the change for each file from the file, or confirming the deletion of another file. Are committed

  • This seems to be uncertain when one of us seems to push the change on the reserves.

  • Although we do not know that it can be related to it, another issue that is happening well is that the folders should ignore the guitgn file Not requested

    • b.

  • Management (pushing, dragging, Collecting) on ​​the repository for the content, we are using the latest version of SourceTree (1.5.2 and 1.9 for Windows for OSX)

  • (PhpStorm)

  • We use a master repository and branch to manage all the changes in satellites.

  • Configuration of GIT config files below:

    • Windows station: 

      [Core] repositoryformatversion = 0 filemode = false bare = false logallrefupdates = true symlink = false ignorecase = true hideDotFiles = dotGitOnly [remote "root"] url = dlaggit@dev.dreamit.de: bring lotto-satellites = + refs / Remote = Basic Merge = OSX Station: [Core] repositoryformatversion = 0 filemode = true bellow = refs / head / *: refs / remote / root / * [branch "master"] remote = original merge = Master

    false logallrefupdates = true ignorecase = true precomposeunicode = false [remote "root"] url = dlaggit@dev.dreamit.de: Take To ferry satellites = + refs / heads / *: refs / remote / root / * [branch "master"] remote = merge seamlessly = Arif / head / Master

    C.

  • > Restore SourceTree and make changes to the Git Config file (underlined) on the OSX machine: 

      [core] repositoryformatversion = 0 filemode = false Naked = false logallrefupdates = true ignorecase = true precomposeunicode = True [remote "root"] url = dlaggit@dev.dreamit.de: bring lotto-satellites = + refs / head

  • the solution given above After shouting, some files change on the copy of the work, which are no longer destroyed, but in modified form (although they were not modified by us), some of them have been recently added. And some have been removed. When we check files in the local folder, the files are still there.

    Thanks for any help you can provide.


    • Comments

    Post a Comment

    Popular posts from this blog

    Pass DB Connection parameters to a Kettle a.k.a PDI table Input step dynamically from Excel -

    -
    Image
    I have a requirement whenever I run my own kettle, dynamically took database connection parameters from an excel source Every run should go. I have an Excel column names: hostname, username, database, password. I want to pass these connection parameters to my table input stage dynamically whenever it runs the job. This is what I was trying to do. You can get it Connection parameters from the DB reading source (for example Excel or a CSV file in my example) < / Li> Store the parameters in the variable Using the variable in your connection's settings. Setting Variables Create another conversion for (you can not do it in the same conversion Uses): set variables element variable: The element that reads / writes your data creates a new connection and sets the connection parameter using $ {variable name_} Note that you will need to type in the field field in the field $ {password} Also keep in mind that this can be a security problem as the
    Read more

    multithreading - PhantomJS-Node in a for Loop -

    -
    I am trying to implement a screen-scraps application that opens a URL in which a parameter changes as it is for a loop: var data = [ '100', '101', '102', '103', '104']; (Var indexA = 0; indexA & lt; data.length; indexA ++) for {Phantom Generation ({'port': freeport}, function (pH) {ph.create page (function (page) {page.open ("http: //...++ data [index B] +" ... " , Status {console.log ("open site:" + data [index B], position); / * OLD * / indexB ++; page evaluation (function () {// page scrape and an object Return}, function {console.log (result.dataRequest); // here is the problem}); / * new and fixed * / indexB ++} first console Logs it: Open Site: 100 Success Opens Site: 101 Success B Ola Site: 102 Success Opening Site: 103 Success Opened Site: 104 Success Which is good. Data is verified in scrap HTML and from index to array Matches. So in page 101 I scrap '101 and retrieve' and pu
    Read more

    c++ - MATLAB .m file to .mex file using Matlab Compiler -

    -
    I know that it can speak as a very famous topic, but something that helps me with it Not found This scenario is: I have my functions function, no matter what's inside, it's a generic function that may depend on other toolboxes. Does. Has input and output; I want to generate the same myFun.mex function; : Lib myFun This way I get some new files: libmyfun.c libmyfun.dll Libmyfun.exp libmyfun.exports libmyfun .h libmyfun.lib Reading around and I think that Creating a myfun.cpp that is very famous is included: / * gateway function * / zero max function (ent NLHS, MXARRA * PLS [], int NRHS, CONST M Xeray * PHS []) Here is the Variable Deals * / / * code here * /} I have tried to do this and are called Regular of Max Generation: Max ('- v', 'myfun.cpp') But I get many errors, and I should say that my myfun.cpp copy / Paste Function is where I have a lot of doubts ... especially on input / output management. My q
    Read more