Search Results

Search found 4369 results on 175 pages for 'merge tracking'.

Page 40/175 | < Previous Page | 36 37 38 39 40 41 42 43 44 45 46 47  | Next Page >

• Sqlserver 2005 Replication issue

  - by Francesco

  Hi, I have a peer to peer Merge Replication from two Sqlserver 2005. The first Sqlserver is both the publisher and distribuitor. All works fine but if the VPN goes down for a couple of hours the replication goes down too and I need to manually restart the sqlserver agent. In the Sqlserver Agent properties I have set the two option about the agent failover but nothing. How I can set an automatic restart of sqlserver agent when the VPN goes down? Thanks

  Read the article

• Can I make fast forwarding be off by default in git?

  - by Jason Baker

  I can't really ever think of a time when I would use git merge rather than git rebase and not want to have a commit show up. Is there any way to configure git to have fast forwarding off by default? The fact that there's an --ff option would seem to imply that there's a way, but I can't seem to find it in the documentation.

  Read the article

• How do I do batch upserts in SQL Server?

  - by Dmitri Nesteruk

  I'm using the MERGE statement to upsert rows in an sql server 2008 database. However, my sproc is a single-row operation, whereas in fact I'd prefer to batch these. Is this even possible and, if so, how do I do it?

  Read the article

• ASP.NET MVC Membership DB must be merged with site DB?

  - by ile

  I am planning to use ASP.NET MVC2 implemented membership system to manage users. Database that uses application should have tables that are related with these users. Is it possible to use two different databases and make relationships (foreign keys) between them or I will have to merge these two databases into one? Thanks, Ile

  Read the article

• Why am I getting tree conflicts in subversion?

  - by Greg

  I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to merge the branch back down into the trunk and any of the files that were added to my trunk after the creation of my branch were flagged as a "tree conflict". Is there any way to avoid this in the future? I don't think these are being properly flagged. Thanks.

  Read the article

• Is there a way to make Git mark a file as conflicted?

  - by Christian Jonassen

  It's possible to commit files that contains conflict data. Is there a way to mark these files as conflicted again, so that running git mergetool will generate the necessary files and run the merge tool?

  Read the article

• Is it possible to determine if two git branches will merge cleanly without affecting the working dir

  - by Andrew Cantino

  You can determine with git merge-base if a fast forward is possible, but is there some git trick to determine if two branches will merge cleanly with some strategy without actually doing the merge? I know about "git merge --no-commit --no-ff $BRANCH" but that affects the working directory, which I'd like to avoid since this is part of a webservice.

  Read the article

• Concatenate arrays items

  - by j.

  I have two arrays: x = [ [0, "#0"], [1, "#1"] ] y = [ [00, "00 description"], [10, "10 description"] ] What i need is to merge them so i get the following as result: result = [ [000, "#0 00 description"], [010, "#0 10 description"], [100, "#1 00 description"], [110, "#1 10 description"]] Is there a method for that? Or I'll need to use collect or something like this? Thanks in advance.

  Read the article

• aargh... InDesign... Where is the merged document?!

  - by TwixxyKit

  I created a mail merge using InDesign, and it looked like it went through all of the records but (1) I can't find the option to export to pdf and (2) I can't find the merged file anywhere on my system at all. Where is it?

  Read the article

• Evil merges in git - where do they come from?

  - by Benjol

  I've read this question and the answers, but what isn't clear to me is WHO creates the "changes that do not appear in any parent". Is it the git merge algorithm screwing up? Or is it because the user has to manually adjust the conflicts to get the thing to build, introducing new code which wasn't in either parent?

  Read the article

• built in function to combine overlapping string sequences in php?

  - by Jamex

  is there a built in function in php that would combine 2 strings into 1? example: $string1 = abcde, $tring2 = cdefg combine to get: abcdefg if the exact overlapping sequence and the position are known, then it is possible to write a code to merge them. TIA

  Read the article

• Subversion Branch Reintegration

  - by Aaron Smith

  When a branch is reintegrated to the trunk, is that branch effectively dead? Can you make modifications to the branch after the reintegration and merge those back into the trunk at a later date?

  Read the article

• How do I accept all changes from a remote?

  - by e-satis

  I'm doing a pull origin some_branch and can see there are a lot of changes. Eventually I don't mind if their erase all mine. How can I accept them all instead or using mergetool and merge files one by one?

  Read the article

• In mercurial, how do I get a preview of the number of files with true conflicts?

  - by Brandon Leiran

  I'd like a quick way to know how many conflicts I will need to merge manually. Is this built-in? Or is there an existing tool to use as the merger to just count this?

  Read the article

• How do I tell git to always select my local version for conflicted merges on a specific file?

  - by saffsd

  Say I'm collaborating with someone via a git repository, and there is a particular file that I never want to accept any external changes to. Is there any way for me to set up my local repo to not complain about a conflicted merge every time I git pull? I'd like to always select my local version when merging this file.

  Read the article

• Order records from multiple models by attribute

  - by Labuschin

  Given the three models “message”, “profile” and “comment” i want to merge them into one list, ordered by their common attribute “created_at”. I want to accomplish something like the project overview in Basecamp - see 3) here: http://basecamphq.com/tour#overview

  Read the article

• Multiple branch merges, stick with Subversion or move to Mercurial or Git?

  - by casualcoder

  Given a situation where there are three branches, A, B and C, where A is merged to both B and C on a regular basis. From time to time B is merged to C. With Subversion, B apparently must be removed and recreated after every merge to C. This raises groans from colleagues, but would any alternative do any better? It would seem to me that Mercurial would not. Perhaps Git? Does anyone else run into this problem?

  Read the article

• Excel - working with multiple workbooks

  - by cKK

  Got about 50 workbooks that cannot be merged but need to make the data available in a nice easy way. Aany ideas how to open and close multiple workbook modally i.e control remains in some interface / menu window? all workbooks have multiple sheets and need to be opened read-only. thanks

  Read the article

• Word mergefield wildcard not correctly matching

  - by aZn137

  Hello, Below is my mergefield code: { IF { MERGEFIELD Subs_State } = "GA" "blah blah" "{ IF { MERGEFIELD CEOrgStates } = "GA" "blah blah" ""} "} I'm pulling records from a MS Access db. My goal is to check whether a record has Subs_State field matching "GA", or the CEOrgStates has the word "GA" (some records have stuff like "|FL|CA|GA|CT|KY|" (no quotes)). When I merged the docs, Word doesnt seem to be able to match with the wildcards: If I use and compare "*GA" (fields ending with GA), it works; however, the double wildcards "*GA*" dont seem to work at all. Here are the things I’ve tried: Have data in lowercase, then compare with lowercase Have data in lowercase, convert to and then compare with uppercase Do the opposite of the above 2 with uppercase data Use “*GA*” and “*ga*” (no pipe) Use different delimiters Nothing seems to work with the double wildcard matching. What am I doing wrong? Thanks!

  Read the article

• Referring to mailmerge fields in an if statement

  - by Zian Choy

  Context: Windows 7 Microsoft Office Word 2007 I have a mailmerge field named "On_FB". Current code: { IF { On_FB } = "Y" "You're on Facebook." "You're not on Facebok."} The moment I get out of code-editing view, the code goes haywire. When I flip back to code-editing view, I see that the code has magically turned into: { IF " Y" = "Y" "You're on Facebook." "You're not on Facebok."} Needless to say, this is a complete bust because it will always say that the person is not on Facebook. I tried putting { On_FB } on its own and that works fine. What can I do to make the If statement work? (By the way, all the { and } were inserted via CTRL+F9.)

  Read the article

• What's the best / easiest way to combine two mailboxes on Exchange 2007?

  - by jmassey

  I've found this and this(2) (sorry, maximum hyperlink limit for new users is 1, apparently), but they both seem targeted toward much more complex cases than what I'm trying to do, and I just want to make sure I'm not missing some better approach. Here's the scenario: 'Alice' has retired. 'Bob' has taken over Alice's position. Bob was already with the organization in a different but related position, and so they already have their own Exchange account with mail, calendars, etc., that they need to keep. I need to get all of Alice's old mail, calendar entries, etc., merged into Bob's existing stuff. Ideally, I don't want to have all of Alice's stuff in a separate 'recovery' folder that Bob would have to switch back and forth between to look at older stuff; I want it all just merged into Bob's current Inbox / Calendar. I'm assuming (read: hoping) that there's a better way to do this than fiddling with permissions and exporting to and then importing from a .pst. Office version is 2007 for everybody that uses Exchange, if that helps. Exchange is version 8.1. What (preferably step-by-step - I'm new to Exchange) is the best way to do this? I can't imagine this is an uncommon scenario, but my google-fu has failed me; there seems to be nothing on this subject that isn't geared towards far more complex scenarios. (2): h t t p://technet.microsoft.com/en-us/library/bb201751%28EXCHG.80%29.aspx

  Read the article

• Concatenate two mp4 videos into one file

  - by Jer

  I recently ripped my DVD collection to play them on my media center PC, and several of them are two-disc movies (i.e. The Lord of the Rings). Since I ripped each DVD individually, that gives me two video files for some movies. I am using Ubuntu Linux - how can I concatenate these two MP4/H.264 videos into a single MP4 video file? Preferably from the command line, and without re-encoding everything during the process (although I can try figuring out a video editor like Pitivi if that's the only solution.)

  Read the article

• Developer workload management software: recommendations?

  - by PaddyC

  In my place, we use two issue tracking tools, one for production bugs, and another for issues on projects in development. These tools are good for managers. However, at an individual level, other work can also arrive through desk visits, email, or the phone, and those allocating the work aren't always interested in issue tracking systems. I've recently rolled off an 18-month project where I got into a cycle of overtime, and I found that I didn't always have good visibility of all work assigned to me. As a result, I was always very busy, and felt constantly laden down with work, but didn't have the clear data to show my manager (or, ironically, the time to stop and gather the information!). A handwritten list, updated at the end of each day, is a good start, but can anyone recommend better tools to help me get a clear view of my own workload? Ideally, I'm thinking of software tools for developers, which could incorporate estimates, but all suggestions welcome. Thanks, Paddy

  Read the article

• Bug Tracker - Feature set - Comparison

  - by Blankman

  Hi, I have installed and played around with a few bug tracking apps, and just wanted to get some feedback and features that a typical (or not so typical) bug tracking software has. I want to make sure I am not overlooking a feature that might come in handy. So the biggest idea is around a bug, which is associated with: Bugs - product - product version - component (specific component of the product) - status - priority - assigned to - expected time to finish - time spent on it so far - created by - historical log of bug Forums Wiki I guess the above functionality is common to all, so what exactly differentiates them? Is it simply the UI and filtering/searching that you base a decision on? (I am comparing something like Jira with FogBugz)

  Read the article

• Using GitHub with another Bug-tracker?

  - by Joehillen

  I am involved in this project, Pinta, and we are currently using GitHub for our development. We all love Git and GitHub and want to keep using it. However, now the project is getting stable and involved, and it's time we started using a more capable bug tracking system than GitHub's simple issue tracker. We also want to start doing GetText based translations. We are looking at Launchpad which has both a nice bug tracker and translation manager, but we want to keep using GitHub for development. I'm worried that these will not integrate well, and it will make development harder. Has anyone used GitHub with another bug tracking system and had any success? Any recommendations?

  Read the article

< Previous Page | 36 37 38 39 40 41 42 43 44 45 46 47  | Next Page >