version control - Need a Plan for Git Push/Pull -

-

i've started work on existing project wasn't using version control system. i've used subversion extensively, management wanted use git. learning it, , learning love it. own sanity, created git repository on windows 7 machine based on files downloaded development environment (linux) had been set me. happily committing changes master, found had change development priorities. realized branching best way go accommodate that. i've adopted "a successful git branching model", , liking far.

challenges

one: project has symbolic links broken in local git repository. want fix them, getting them git repository. have tar archives available of production code, don't know how accomplish sane merge of that. on windows use winmerge doesn't preserve symbolic links. once have repository set on development server, abandon commits windows machine , pull server?

two: project has file path goes way file system root. i've seen articles people using git versioning config files , having repository @ file system root, haven't seen example of .gitignore file make painless possible. what's course of action this?

update #2

these rules accomplishing need:

/*                       # ignore in root default !.gitignore              # allow file !/library                # allow library !/home                   # allow user directories /home/*                  # not every user !/home/user              # user /home/user/*             # not user's files !/home/user/public_html  # public_html files !/home/user/www          # symbolic link public_html


Comments

Post a Comment

Popular posts from this blog

Detect support for Shoutcast ICY MP3 without navigator.userAgent in Firefox? -

-
the current version of mozilla firefox 23.0.1, version not support play mp3 shoutcast streams tcp port different 80 (most common 8000 shoutcast 1.9.8). i use flash when mp3 support not available in html5 audio, way detect is: try{ var = document.createelement('audio'); r = !!(a.canplaytype && !!a.canplaytype("audio/mpeg; codecs=mp3").replace(/^no$/,'')) }catch(e){ r = false; } the support mp3 shoutcast streams in firefox added in version 24 . a.canplaytype("audio/mpeg; codecs=mp3") = in chrome , firefox, chrome support, firefox not support, due current code detect not work firefox. the current version of jquery support ie 6 1.10.2, version not has .browser i think "stylized" way testing features , not querying browsers / versions, notwithstanding here see hard not violate "principle". what "stylized" way of detect mp3 icy support without navigator.useragent in firefox? ther...
Read more

web - SVG not rendering properly in Firefox -

-
i have problem svg renderring in firefox. whilst works in safari, chrome or in ie, doesn't work in firefox. inspecting element seems layers there, background visible if it's z-index higher z-index of others. rendered in firefox: svg logo in firefox link original source file: svg file thanks help. ps: used sketch 3 export svg. if helps somehow. you're experiencing bug 995813 . i fixed bug time ago change still making way through release process example display correctly firefox 31 onwards released on 22 july 2014. in meantime if move fill="white" <mask> element child <use> element work around firefox bug.
Read more

visual studio - TFS will not accept changes I've made to a Java project -

-
i using tfs's team explorer manage visual studio projects. recently, i've created new java project (not in visual studio) manually added tfs using source control control explorer in visual studio. after added java project tfs, made changes , bug fixes. then, went visual studio , opened source control explorer check in changes, tfs thinks no changes made. it seems needed check out project before making changes. guess erroneously expected tfs track automatically, okay. so, using source control explorer in tfs, checked out project, , tried check in pending changes. when tried check in, got following message: all of changes either unmodified files or locks. changes have been undone server. is there way convince server indeed project has changed? how can check in changes have made? thank help.
Read more