Search Results

Search found 4819 results on 193 pages for 'git merge'.

Page 79/193 | < Previous Page | 75 76 77 78 79 80 81 82 83 84 85 86  | Next Page >

  • SVN Merge, then rebase.

    - by Nix
    I am trying to find the proper way to reintegrate the changes in my SVN branch to the trunk, and the rebase. I have successfully merged my changes from the branch back to the trunk using, reintegrate merge http://mybranch into C:\code\trunk Now i need to recreate my development branch from the trunk. What is the best way to do this?

    Read the article

  • awk/sed/bash to merge data

    - by Kyle
    Trying to merge some data that I have. The input would look like so: foo bar foo baz boo abc def abc ghi And I would like the output to look like: foo bar baz boo abc def ghi I have some ideas using some arrays in a shell script, but I was looking for a more elegant or quicker solution.

    Read the article

  • merge two binary images using Matlab

    - by Pier-alexandre Bouchard
    I need to create two different black binary rectangles using Matlab, to overlay a part of both and to extract the insertion. How can I overlay two binary images? -------|----------| | | 2 | | 1 |----|-----| | | |-----------| I created my two binary images using the false(X, Y) Matlab function. I dont find how to produce the merge the two images and to extract the insertion.

    Read the article

  • Merge documents

    - by Jelle
    I'm trying to merge two docx-documents into one docx-document using OpenXML SDK 2.0. The documents should be merged without loosing their styling and custom headers and footers. I hope I can achieve this using AltChunk and a section break. But I can't get it working. Is it possible what I'm trying to do? Can someone give me a hint how to achieve this?

    Read the article

  • Replace merge fields with text with OpenXML SDK 2.0

    - by uggwar
    What is the best way to remove all merge fields from a word 2010 document using openxml sdk 2.0, and replace them with a simple text? I have some difficulties to remove them cleanly. Have tried to remove all Run objects that includes a FieldCode with a "MERGEFIELD" defined, and appended a new Run with my text. But I am missing something crucial since the field seems to stay defined for this element.

    Read the article

  • awk/sed/bash to merge/concatenate data

    - by Kyle
    Trying to merge some data that I have. The input would look like so: foo bar foo baz boo abc def abc ghi And I would like the output to look like: foo bar baz boo abc def ghi I have some ideas using some arrays in a shell script, but I was looking for a more elegant or quicker solution.

    Read the article

  • Merge shapes and draw border around final shape

    - by Peter
    I can't post images yet: http://i.imgur.com/7Kci5.jpg Using Actionscript 3 I'm drawing multiple Shapes onto a MovieClip [top drawing]. The end result I need is the bottom drawing. I originally thought it would be simple to just merge the shapes and then find a way to draw a border around the end result but I can't seem to find any way of doing this. Is this possible or is there a better way of trying to do this?

    Read the article

  • Merge entries in XMLfile (SimpleXML in PHP)

    - by Cudos
    Hello. I have this in my XML file: <product name="iphone"> <variant name="iphone" product_number="12345" price="500" picture="iphone.jpg"> <description><![CDATA[iphone]]></description> <short_description><![CDATA[]]></short_description> <deliverytime><![CDATA[]]></deliverytime> <options> <option group="Color" option="Black" /> </options> </variant> </product> <product name="iphone"> <variant name="iphone" product_number="12345" price="500" picture="iphone.jpg"> <description><![CDATA[iphone]]></description> <short_description><![CDATA[]]></short_description> <deliverytime><![CDATA[]]></deliverytime> <options> <option group="Color" option="White" /> </options> </variant> </product> I want to merge it into this (Note that I merge the options tag): <product name="iphone"> <variant name="iphone" product_number="12345" price="500" picture="iphone.jpg"> <description><![CDATA[iphone]]></description> <short_description><![CDATA[]]></short_description> <deliverytime><![CDATA[]]></deliverytime> <options> <option group="Color" option="Black" /> <option group="Color" option="White" /> </options> </variant> </product> Preferably I want to do it all in the memory since I will process it further afterwards.

    Read the article

  • Teamcity 2 configurations merge and deploy

    - by ChrisKolenko
    Hi Everyone, I have two teamcity configurations one becoming my common helpers and reuseable components and my other a website which uses the common project. I use a third configuration to publish to a test environment. When the third configuration is run i would like it to get the artifacts from the common project and merge them with the website output and deploy. Am i asking for two much?

    Read the article

  • Please help me to deploy merge modules

    - by Dabblernl
    I need to deploy some Crystal Reports XI .dlls (craxdrt.dll, crviewer.dll) to client computers. Craxdrt.dll has many dependencies. I found out that the easiest way to go about this is to use the supplied merge modules. Having always relied on ClikOnce deployment I am at a total loss how to do this. If it matters: the .exe is written in VB6, but I have visual studio 2010 to make setup projects. Thanks!

    Read the article

  • How can you Merge sort a .Net framework LinkedList (of T)

    - by Andronicus
    There's a few questions discussing Merge sorting a LinkedList, but how can I do it with the C# LinkedList? Since the LinkedListNode Next and Previous properties are read-only most of the in-place algorithms I've come across are not possible. I've resorted to removing all the nodes, sorting them with a .OrderBy(node = node.Value) and then re-inserting them into the Linked list, but it's fairly crude.

    Read the article

  • How to merge 2 XML streams in Java by XSLT

    - by user327933
    I'd like to merge 2 XML streams (strings) in Java, necessarily by XSLT (that I could change the transformation), but the problem is that the XMLs come as a string. There are many examples, but through the files. Can this be done without saving them in files? Thanks.

    Read the article

  • .gitconfig error

    - by Tanner
    I edited my .gitconfig file to add support for LabView and it appears that I did something that Git doesn't exactly like. The problem is it (Git) doesn't tell me what it doesn't like. What did I do wrong? The error message doesn't help much either: "fatal: bad config file line 13 in c:/Users/Tanner/.gitconfig" [gui] recentrepo = C:/Users/Tanner/Desktop/FIRST 2010 Beta/Java/LoganRover [user] name = Tanner Smith email = [email protected] [merge "labview"] name = LabView 3-Way Merge driver = “C:\Program Files\National Instruments\Shared\LabVIEW Merge\LVMerge.exe” “C:\Program Files\National Instruments\LabVIEW 8.6\LabVIEW.exe” %O %B %A %A recursive = binary And I'm not seeing a line 13, but usually that would mean something is wrong at the end? I don't know, Git is new to me.

    Read the article

  • How significant is the bazaar performance factor?

    - by memodda
    I hear all this stuff about bazaar being slower than git. I haven't used too much distributed version control yet, but in Bazaar vs. Git on the bazaar site, they say that most complaints about performance aren't true anymore. Have you found this to be true? Is performance pretty much on par now? I've heard that speed can affect workflow (people are more likely to do good thing X if X is fast). What specific cases does performance currently affect workflow in bazaar vs other systems (especially git), and how? I'm just trying to get at why performance is of particular importance. Usually when I check something in or update it, I expect it to take a little while, but it doesn't matter. I commit/update when I have a second, so it doesn't interfere with my productivity. But then I haven't used DVCS yet, so maybe that has something to do with it?

    Read the article

< Previous Page | 75 76 77 78 79 80 81 82 83 84 85 86  | Next Page >