Search Results

Search found 46019 results on 1841 pages for 'version control'.

facebook twitter digg google delicious technorati stumbleupon myspace wordpress linkedin gmail igoogle windows live tumblr viadeo yahoo buzz yahoo mail yahoo bookmarks favorites email print

Page 144/1841 | < Previous Page | 140 141 142 143 144 145 146 147 148 149 150 151  | Next Page >

  • What's the best visual merge tool for Git?

    - by andy
    Title says it. What's the best tool for viewing and editing a merge in Git? I'd like to get a 3-way merge view, with "mine", "theirs" and "output" in separate panels. Also, instructions for invoking said tool would be great. (I still haven't figure out how to start kdiff3 in such a way that it doesn't give me an error) edit: My OS is Ubuntu.

    Read the article

  • git workflow incorporating many, but not all commits from many forks

    - by becomingGuru
    I have a git repo. It has been forked several times and many independent commits are made on top of it. Everything normal, like what happens in many github hosted projects. Now, what exact workflow should I follow, if I want to see all that commits individually and apply the ones I like. The workflow I followed, which is not the optimal is to create a branch of the name github-username and merge the changes into my master and undo any changes in the commit I dont need manually (there are not many, so it worked). What I want is the ability to see all commits from different forks individually and cherry pick and apply them on top of my master. What is the workflow to follow for that? And what gui (gitk?) enables me to see all different individual commits. I realize that merge should be a primary part of the workflow and not cherry-pick as it creates a different commit (from git's point of view). Even rebasing other's changes on top of mine might not preserve the history on the graph to indicate that it is his commits I have rebased. So then, How do I ignore just a few commits from a lot of them? I think github should have a "apply this commit on top of my master" thing in their graph after each commit node; so I can just pull it, after doing all that.

    Read the article

  • How Can I Add a New Command to a Control's Event

    - by Chris
    Hi, thanks for taking a look at this question. I have been building an application (VB/WPF) following Josh Smith's example of an MVVM pattern: Click here to view My Views have Controls which trigger a Command upon an event, such as a button click and these are bound to properties in the ViewModel. My ViewModel exposes properties of type ICommand which invoke the appropriate methods. This has worked well, until now! I now want to use a Thumb Control to allow a user to move an object within a Canvas. I don't believe that the Thumb has a Command capability 'out of the box'. A Thumb raises a 'DragDelta' event when being moved. So my question is as follows: How do I extend a Control's capability to issue a Command upon an event please? I wish to issue a new Command, let's say 'onDragDelta' so that I can bind it to a property in my ViewModel just like my Buttons. Thank you very much

    Read the article

  • Mercurial: pull changes from unversioned copy

    - by Austin Hyde
    I am currently maintaining a Mercurial repository of the project I am working on. The rest of the team, however, doesn't. There is a "good" (unversioned) copy of the code base that I can access by SSH. What I would like to do is be able to do something like an hg pull from that good copy into my master repository whenever it gets updated. As far as I can tell, there's no obvious way to do this, as hg pull requires you have a source hg repository. I suppose I could use a utility like rsync to update my repository, then commit, but I was wondering: Is there was an easier/less contrived way to do this?

    Read the article

  • Xcode 4.2 how include one project into another one?

    - by Alex Stone
    I keep searching, but cannot find a clear and simple explanation on how to include one XCode project, along with all of it's sub-classes into another project. I routinely see stuff like that in sample projects that I download off the web, but do not know how to do this myself. Within XCode, along with .h and .m files, and folders, there's a whole new project, starting with a blue xcode project icon, that is expandable to contain everything within the project. Please, can someone explain to me step by step what do I need to do to add one XCode project into another one? I've seen a ton of one liners like "header search paths", but that does not tell me much. UPDATE: After re-reading the documentation, I realized that the project to include must be dragged ONTO the BLUE project icon of the parent project. Regular sources can be dragged anywhere, but a project must be dragged onto a project. Thank you!

    Read the article

  • 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

  • Why does git remember changes, but not let me stage them?

    - by Andres Jaan Tack
    I have a list of modifications when I run git status, but I cannot stage them or commit them. How can I fix this? This occurred after pulling the kernelmode directory from a bare repository somewhere in one huge commit. % git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: kernelmode/linux-2.6.33/Documentation/IO-mapping.txt # ... $ git add . $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: kernelmode/linux-2.6.33/Documentation/IO-mapping.txt # ...

    Read the article

  • Difference between Revert and Update in Mercurial

    - by Edan Maor
    I'm just getting started with Mercurial, and I've come across something which I don't understand. I made changes to several files, and now I want to undo all the changes I made to one of them (i.e. go back to my last commit for one specific file). As far as I can see, the command I want is revert. In the page I linked to, there is the following statement: This operation however does not change the parent revision of the working directory (or revisions in case of an uncommitted merge). To undo an uncomitted merge, you can use "hg update -C -r." which will reset the parents to the first parent. I don't understand the difference between the two (hg revert vs. hg update -C -r). Can anyone enlighten me as to the difference? And in my case, do I really want the revert or the update to go get rid of the changes I made to the file? Thanks

    Read the article

  • Problem using ScriptManager.RegisterStartUpScript in user control - Script Error "function is not de

    - by poojad
    I have a aspx page which contains a User Control uc1 ans within uc1, there is another user control uc2. Now I need to call a javascript function in the uc2's page load. (I understand that the Pages are not properly designed, but I am sorry as this is an old application, I am not supposed to make any changes in the design) I am doing this using ScriptManager.RegisterStartUpScript as I have an update panel, but the function is not being called and the script error "load is not defined" is fired. (load is the javascript function in uc2) Can anyone help me out with this? Thank you.

    Read the article

  • Subversion merging, tree merge

    - by krystan honour
    I need to merge changes from a branch back into trunk but want to continue work on the existing branch. I was going to use a re-integrate merge but realised this is not suitable as I will need to recreate my branch etc which for a variety of reasons is not desirable. What I really want to do is merge the current revisions in the branch down to head and then keep people working on their current working copies. So my question is , can tree merge be used to solve this or do I have to reintegrate and recreate.

    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

  • ToolTip for a User Control Issue

    - by Gaddigesh
    I have a control inherited from usercontrol, I have implemented it such a way that it acts as XY Plane and displays curves. When user clicks and holds the mouse down for 1 sec i trigger SetToolTip to display tooltip indicationg (x,y) coordinates. Tooltip remains even on drag updating x,y positions System.Windows.Forms.ToolTip myToolTip = new System.Windows.Forms.ToolTip(); myToolTip.SetToolTip(myControl,"x= val,y=val"); It is working fine But Tooltip stops showing after (1)I play around for sometime(click,drag repeatedly) and will never show up (2)I move some other window on this control(this happens sporadically) what could be the problem???

    Read the article

  • Step-by-step guide of Mercurial for iPhone projects?

    - by Horace Ho
    I am looking for a step-by-step Mercurial guide for iPhone projects. Please assume: hg already installed the audience is comfortable with command line operations everything is on OS X As a newbie, I am particular interested in: what files should be excluded how to exclude above files guideline/suggestion of naming builds any relevant experience to share with Please do not discuss how hg is better/worse than any other SCS. This is a how-to question, not a why question. Thanks!

    Read the article

  • swf file upload control not filtering the files for the second time

    - by subash
    iam using swf file upload control in my application developed in asp.net & c#.net. i am having a dropdown box with file types like jpeg,.xls ,.txt etc. so when i select particular file type in the dropdown and clicking on the button would open a filedialog showing only the files of the type selected in the dropdown. The problem is that when i select "jpeg" for the first time file dialog shows only jpeg files. when i select ".xls" next time it shows again the prevoiusly selected jpeg files and not currently selected ".xls". but while debugging it was found the file type definition in the swf code has been changed to .xls . can any one guide why the file upload control not mapping the selected file for the second time

    Read the article

  • webui for mercurial (hg)

    - by Extreme
    i'm looking for a good webui tool for mercurial. i've found this link Mercurial with WebUI but what i'm looking for is something that has the ability to do check-in and check-out per file like the PVCS. any suggestions? thanks Edit: Here's the link for PVCS. http://en.wikipedia.org/wiki/PVCS It's been around 4 years since I last used PVCS and a lot has probably changed but here's as far as I remember. It has a web application wherein a developer can check out a single file. If this file is checked-out, it will be locked to this developer and no other developer can check it out. Then can download the source but they won't be able to check it in unless the original developer (that checked-out the file) checks it in.

    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

  • Accessing WPF Template for Custom Control from Code behind

    - by Ashwani Mehlem
    Hi, i am trying to access a named grid inside a default template for a custom control from code behind. But it seems that the template for the control is null, even after calling ApplyTemplate(). Is that impossible inside the controls constuctor? Here's the code: Generic.xaml: ... <ControlTemplate TargetType="{x:Type local:TimeTableControl}"> <Grid Name="ContentGrid"> </Grid> </ControlTemplate> ... TimeTableControl.cs: public TimeTableControl() { ApplyTemplate(); contentGrid = (Grid)(Template.FindName("ContentGrid", this)); //Line above causes null-pointer-exception ... }

    Read the article

  • How to customize tooltip for silverlight control?

    - by KentZhou
    SL provide ToolTipService.ToolTip for simple tooltip. I want to customize tooltip with my own user control. One way is to do something like: <TextBlock Text="Hello" > <ToolTipService.ToolTip> <TextBlock Text="I can help you." /> <!--replace this with user control --> </ToolTipService.ToolTip> </TextBlock> But what I want is: 1) create a style for tooltip, so that it can be set as something like <TextBlock Text="Hello" Style="{StaticResource TextBlockWithToolTip}" > 2) Content for tooltip can be set dynamically from datacontext, such as title, content, etc. How to implement it?

    Read the article

facebook twitter digg google delicious technorati stumbleupon myspace wordpress linkedin gmail igoogle windows live tumblr viadeo yahoo buzz yahoo mail yahoo bookmarks favorites email print

< Previous Page | 140 141 142 143 144 145 146 147 148 149 150 151  | Next Page >