Search Results

Search found 42218 results on 1689 pages for 'os version'.

Page 156/1689 | < Previous Page | 152 153 154 155 156 157 158 159 160 161 162 163  | Next Page >

  • heroku using git branch is confusing!

    - by Stacia
    Ok, so I have a big github project that i'm not supposed to merge my little Stacia branch into. However, it seems like Heroku only takes pushing MASTER seriously. It looks like I pushed my branch, but for example if I only have my branch, it even acts like there's no code on the server. I can't even get my gems installed since the .gems file is on my branch. Basically I don't even want Heroku to know there's a master. I just want to use my test Stacia branch. But it keeps ignoring my local branch. Is there a way to do this? And again, I don't want to overwrite anything on the main Github repository (eeek!) but it would be ok probably if I had both master and my branch on heroku and merged them there. I am a total git novice (on windows no less) so please bear with me.

    Read the article

  • SVN Source control issues when merging changes

    - by HollyStyles
    I have seen where changes have been made on one code file by two developers code like this: x++ End up like this: x++ x++ where due to carriage returns being inserted/removed (I think) one line has become silently merged as two lines of the same code (no conflicts) Everything compiles but suddenly tests are failing and weird behaviour ensues. Should this be possible? How do I guard against it?

    Read the article

  • Git - switching between branches in the middle of work

    - by Art
    For various reasons (code review mostly) I need to switch from current development branch to other branches quite often. Currently, I use either 'git stash' to shelve the uncommitted changes, checkout other branch, then switch back and do 'git stash apply' However, sometimes I'd have some newly added files there, which are not tracked. Unfortunately, stashing does not affect them. In this case I'd have to add them to the index and stash. What I am looking here for is a workflow where I'd have to perform a minimal set of actions to switch the branches, preferably avoiding adding of files into the index.

    Read the article

  • Visualise Workflow Diagram from plain text

    - by Dmitriy Nagirnyak
    Assuming there is a plain text with description of the workflow (Just plain English in some predefined format). Are there any tools (better online) to visualize the flow based on a plain text? What for: to store the description of the workflow in a source control system and be able to quickly remember/understand that.

    Read the article

  • How to add file revision (not the last changed revision) to Subclipse "Label decorations"?

    - by mlvljr
    Firstly, please beware I'm new to SVN. Then, my question has much in common with Get current revision number in Subclipse?. The (seeming) problem is (I use Ecpilse v3.5.0 (build id I20090611-1540)): My freshly installed Subclipse plugin offers "revision - last revision loaded into workspace" label under "Windows > Preferences > Team > SVN > Label decorations" That seems to correspond to "Last changed revision" under "File > Properties > Subversion" (and not the "Revision" there). Hence, the question.

    Read the article

  • Word Interop compile time error

    - by user114385
    I am getting the following error when referencing the assembly Microsoft.Office.Interop.Word in my asp.net application. The type 'Microsoft.Office.Interop.Word.ApplicationClass' exists in both 'C:\WINDOWS\assembly\GAC\Microsoft.Office.Interop.Word\11.0.0.0_71e9bce111e9429c\Microsoft.Office.Interop.Word.dll' and 'C:\WINDOWS\assembly\GAC\Microsoft.Office.Interop.Word\12.0.0.0_71e9bce111e9429c\Microsoft.Office.Interop.Word.dll' Previously, I was getting the error but the 12.0.0.0 was in the PIA directory under Visual Studio, but the error message was the same, except pointing to a different path. Since then, I copied the dll to the GAC, but with the same error. I thought that .Net was supposed to take care of this. Can anyone give me some help? Thanks BTW, I am doing this using Visual Studio .Net 2008

    Read the article

  • source control when starting up a new project

    - by jaras
    when starting with a project and using source control i find it hard to separate the things people are working on so they don't either write duplicate code or think it should be named one thing and so on. this problem diminishes over time because the general foundation is in place and it's easier to separate the tasks so they don't overlap as much how do you manage working with source control in the beginning phase? EDIT: I can see that it don't really have anything to do with source control, but it gets more apparent when you have source control too. so the question becomes more along the lines of "how do you manage to separate the tasks so they don't overlap too much. I think it's really hard and i haven't really seen much about how to do it.

    Read the article

  • How do you get notified of your repos' updates?

    - by furtelwart
    I'm working on several repositories at work and would like to be informed, if anything changes in the SVN repositories. I made a small BAT script (yes, BAT is usefull sometimes) that keeps executing an svn log -r BASE:HEAD on my working copy. It shows all submit comments and revision dates. It works really well but it's not comfortable for different repositories. How do you keep track of changes in your repositories? Do you use a small program you made for yourself? Do you use software someone else made? I'm interested in every approach to this problem. I would like to get notifications and several more information about the commit. The IDE integrated functions are good, but work only if I request the information. I don't want to act to get this information. Platform: Windows, Subversion 1.5 and higher.

    Read the article

  • How do I convert a git repository to mercurial?

    - by Spoike
    I've been developing a java application using git as source code repository. I'd like to share the project with other java developers and hg seems to be most used by them. My question is how do I convert a git repository to hg? If I tried googling "convert git to hg" and every search hit is about converting from git to hg. I'm also using TortoiseHg.

    Read the article

  • Updating Commit Message in Mercurial MQ extension

    - by Jerub
    After using hg qnew and hg qrefresh to create and update a patch that I want to apply to my repository, but the commit message that I wrote when I did hg qnew was not very good, it did not reference the ticket number from trac, and I would like to say something in it about some of the issues that my commit addresses. How do I do something like hg qrewritemycommitmessage. I have examined the docs on the website (starting here: http://mercurial.selenic.com/wiki/MqExtension ) and I have come up blank.

    Read the article

  • What needs checking in for a Grails app?

    - by Bill James
    What parts of a Grails application need to be stored in source-control? Some obvious parts that are needed: grails-app directory test directory web-app directory Now we reach questions like: If we use a Grails plug-in (like gldapo), do we need to check in that plugin? Do Grails plugins install in the Grails directory, or your project? I'm not looking to start a religious war about .project, so please ignore that, but are there any "hidden" project files I need to worry about, along with the plugin issues? Converted to a community wiki, as new versions of Grails have changed some of these solutions, especially as regards plugins.

    Read the article

  • Git dirctet acyclic graph - children know their parents but not the other way around

    - by dayscott
    Git is implemented as a directed acyclic graph. Children know their parents but not the other way round. This makes sense because i can reach every commit only through a branch or a tag ( generally speaking through a reference). That's how i traverse the tree. What other reasons had the developers of Git to make "the children know their parents but not the other way around"?/ What are the key benefits of this?

    Read the article

  • Add existing project to solution under visualvsn

    - by Eric
    We are changing from SourceSafe 2005 to visual svn. How can an exisiting project be added to a solution Example: I create solution1 with 3 projects and add to /trunk I create solution2 with 1 project and add to /trunk In solution1 I add existing project from solution2, but I cannot add to subversion. I get "out of working copy, use the VisualSVN-Set Working Copy root menu" In SourceSafe2005 it would just link, what is the procedure for VisualSVN? Branch? Regards _Eric

    Read the article

  • Does git ignore empty folders?

    - by Eno
    I created an Android project, added it to my git repo, comitted and pushed my clone to the master. Later I tried checking out the project and Eclipse complained about missing src folders. I checked my repo and the master repo and the src folders are missing (Im sure they were there when I created the project). So can someone explain what happened here? Im new to git so maybe I missed something?

    Read the article

  • How to get hudson to display the SCM diff since last build in the individual build page

    - by Steen
    I'm not sure it's even possible, but my command line usecase goes something like this: do svn update do a svn log -l {how many times since my last commit - 1} do a `svn diff -rHEAD:{my last commit revision + 1} and try to get an overview of what happened since last time I touched the code. I get a lot of valuable information from this, and would like everybody in my team to get the same feeling of control and overview of the code base. Not everyone in my team is comfortable with the command line but like the hudson interface. So; is there a way to the the commit diff since last build (we do a build per commit) in the individual build page?

    Read the article

  • Git command to display HEAD commit id?

    - by Andrew Arnott
    What command can I use to print out the commit id of HEAD? This is what I'm doing by hand: $ cat .git/HEAD ref: refs/heads/v3.3 $ cat .git/refs/heads/v3.3 6050732e725c68b83c35c873ff8808dff1c406e1 But I need a script that can reliably pipe the output of some command to a text file such that the text file contains exactly the commit id of HEAD (nothing more or less, and not just a ref). Can anyone help?

    Read the article

  • Advantages of three-way automatic merging vs. two-way

    - by bnsmith
    I'm interested in understanding two-way and three-way merging of source code files. Based on what I've read, two-way merging has some "crippling weaknesses" compared to three-way merging. What I'd really like to see are one or two simple, concrete examples of cases where three-way merging is able to automatically merge something from a branch to the trunk without producing conflicts, while two-way merging falls down and requires a bunch of manual intervention to get the code merged. Any links to blog posts or even references to books would be appreciated (yes, I have Googled this for an hour or so). Thanks!

    Read the article

< Previous Page | 152 153 154 155 156 157 158 159 160 161 162 163  | Next Page >