Search Results

Search found 703 results on 29 pages for 'conflicts'.

Page 9/29 | < Previous Page | 5 6 7 8 9 10 11 12 13 14 15 16  | Next Page >

  • Can I do a git merge entirely remotely?

    - by CaptainAwesomePants
    My team shares a "work" branch and a "stable" branch. Whenever a particular work branch is approved for further testing/release/etc, we merge it into stable. No code is ever checked directly into the stable branch. Because of this, merge conflicts simply won't happen, and it seems silly to pull down the work branch and the stable branch, merge them, and then push the changes back. Is there a git command to ask a remote git server to commit a merge of two branches that it already knows about?

    Read the article

  • Should I understand SVN before I jump to GIT?

    - by John Isaacks
    I work in a department where no one has ever used source control before, including myself. I am trying to push the concept. I have spent a little while researching SVN. I some basics learned. I can Create/update/checkout/commit with command line and from Tortoise. I am starting to learn how to tag and branch but still confused a lot about conflicts between branches and trunk etc. I am still learning, but I do not have a physical person who can show me anything. Its all from books/tutorials and trial and error. From what I have read online it seems like git is the better thing to know, but its also more complicated. I don't want to overwhelm myself. Should I continue to master svn before moving to git or would I be wiser to just jump to git now? Are there pros and cons to both approaches?

    Read the article

  • Can't connect to wireless without typing sudo modprobe b43 in terminal

    - by user90889
    I just upgraded to 12.04 on an old ACER Travelmate 5320 using Broadcom 4311. I wasn't able to connect to the internet through the wireless for a few days. It didn't even display wireless networks. I was finally able to make it work by following the instructions found here: http://linuxwireless.org/en/users/Drivers/b43#supported However, each time I log on to the computer I have to go to the terminal and type sudo modprobe b43 to make the wireless work. Is there somehow I can avoid this? I have used Ubuntu for many years but always relied on other people to help me with the technical stuff. The terminal is alien to me so I literally follow online forum instructions without knowing what I'm doing. Also, I tried many many things before I managed to make it work. So I'm worried I may have installed something that now conflicts with whatever the sudo modprobe b43 does. Thank you

    Read the article

  • How to prioritize tasks when you have multiple programming projects running in parallel?

    - by Vinko Vrsalovic
    Say you have 5 customers, you develop 2 or 3 different projects for each. Each project has Xi tasks. Each project takes from 2 to 10 man weeks. Given that there are few resources, it is desired to minimize the management overhead. Two questions in this scenario: What tools would you use to prioritize the tasks and track their completion, while tending to minimize the overhead? What criteria would you take into consideration to determine which task to assign to the next available resource given that the primary objective is to increase throughput (more projects finished per time unit, this objective conflicts with starting one project and finishing it and then moving on to the next)? Ideas, management techniques, algorithms are welcome

    Read the article

  • How can I convince a project manager that there is no way to solve all the compatibility issues?

    - by SAFAD
    I have been working on this project for more than a year now, and we are close to release, the project manager wants the product to be perfect and working in every single aspect. I like that and I love working under the perfection idea, but it seems he is delaying the launch too much because of compatibility issues, he wants the product to work in every single installation, every single configuration possible, and in most cases, the product just works without issues when it's on the hands of the client. UPDATE : yes the product doesn't work properly when there are conflicts, for example, other products that don't use guidelines nor standards to load libraries (causes double library load which leads to failure), cache is another example and so on..... but we warn the clients about the conflict before purchasing and help them fixing it after purchasing I've tried to explain it by giving some examples on major products, he understands the situation, but can not believe that it is near impossible (if it is not impossible) to do what he wants. Hope it is clarified enough for the community to answer.

    Read the article

  • Upgrade to Ubuntu 13.10 disabled track pad, brightness, sound on Lenovo Z570

    - by Vizir
    I just upgraded to Ubuntu 13.10 using Ubuntu's software update. It seemed to go all right, however after the system restarted and booted up Ubuntu 13.10, it began experiencing several problems. Some of them were due to expected conflicts with the updated OS, however right now I cannot figure out why certain hardware functions are now "broken" and how to fix them. As far as I can tell, these are the sound (permanently muted), mic (picks up no sound), brightness (set at maximum brightness regardless of using keyboard shortcuts or moving the screen brightness slider) and trackpad (mouse does not move, however plugged-in USB mouse does) This sounds to me like a driver issue, however I cannot figure out how to re-enable my drivers, re-install them, or whatever I have to do here. This did not happen durring my upgrades from 12.04 to 12.10, or 12.10 to 13.04, so I'm at a total loss as to why this happened this time around. My computer is a Lenovo Z570, dual-booting Ubuntu and Windows 7 from GRUB 2. Windows is working fine as far as I can tell.

    Read the article

  • How to replace avconv with (the real) ffmpeg and have it work right?

    - by u2n
    Anyone know how to install the real, current ffmpeg (not the older version by avconv that comes w/ Ubuntu) without having the problems mentioned here? Reasons: Everything works (or so many have written), Use the new syntax, and After some research -- and without getting into the controversy -- I simply believe the packagers made a mistake going with avconv. This is a fix. Apparently this isn't as easy as it should be due to versioning conflicts, and that avconv and ffmpeg can't coexist on the same machine (noted in the above post). Though at least one guide mentions installing ffmpeg locally (~) to achieve coexistence. My release is Precise 12.04.3 LTS, but it appears this would apply to newer ones also.

    Read the article

  • Ubuntu 14.10 no GUI or term login

    - by Lito
    I have updated yesterday my Ubuntu 14.10 installation with apt-get dist-upgrade. I was working all afternoon and after that I have rebooted computer. Once done it, lightdm doesn't starts (only gnome logo) and I can not view any of Ctrl + Shift + [1-6] terminals (cursor is blinking). I have read a lot of posts with no success: nividia/intel conflicts (I have a laptop with an Intel graphic card) I have enabled nomodeset and tried all this options My computer boots to a black screen, what options do I have to fix it? I have repaired grub I can load recovery/livecd/windows and mount partitions and network without problem I have all packages and system updated Here my logs. X11 not shows any error or problem, is loading all needed drivers without problem. How can I raise the level of debug? Best regards.

    Read the article

  • What is the point to namespaces in branches in git?

    - by dukeofgaming
    So I mainly use Mercurial for my projects and I decided to sit down and learn all Git's shenanigans to discover if I'm in the right side (at least for me). I'm learning that git uses namespaces for branches and I would like to know (in your experience) what is the point of namespaces?. In Mercurial I could just set the convention of naming branches like so: <branch name> //for "origin" branches <username>/<branch name> //for user branches I imagine that there is more to it than just the name (aside from avoiding naming conflicts), but what do I get out of this seemingly more complicated (not necessarily bad) model?

    Read the article

  • How do you deal with monotony of certain tasks? [on hold]

    - by aaronmallen
    I love programming methods, and functions. The if {}, while {}, etc... logic behind them is so much fun. I also love making commits, merging branches, solving merge conflicts. Unfortunately these activities usually require that I create classes which I find tedious and monotonous. The simple action of defining properties, is getting in the way of me writing the logic on what to do with those properties. I can't be alone here there has to be a part of coding for everyone that they dread or at least severely dislike doing compared to other parts of coding. How do you deal with the code based tasks that you find tedious?

    Read the article

  • Dynamically loading type in Silverlight with Type.GetType()

    - by ondesertverge
    Trying to specify the assembly name like this: Type.GetType(string.Format("{0}.{1}, {0}", widget.Assembly, widget.Class)); Throws this: The requested assembly version conflicts with what is already bound in the app domain or specified in the manifest Trying it without the the assembly: Type.GetType(string.Format("{0}.{1}", widget.Assembly, widget.Class)); Returns null. I am looking for a way to instantiate a class using it's fully qualified name in Silverlight 4.0. Thanks.

    Read the article

  • How to speedup perforce auto resolve?

    - by Sorin Sbarnea
    I would like to know how to speedup the perforce auto resolve when doing integration (merge yours and theirs if no conflicts exists). Currently is taking hours for ~5000 files when running it using a proxy server even if the proxy server has the files pre-cached. Also p4v interface doesn't give you any hint regarding the progress of the task, you do not know if it will finish in a second or next year.

    Read the article

  • What is Jquery's alternative to Mootools MochaUI?

    - by chris
    MochaUI is very intuitive and the modal iframes almost perfectly replicate Windows. Unfortunately, I have scripts written in Jquery that I use, and I hear there are conflicts when putting both Mootools and Jquery on one html file (is this true?). How can I get the MochaUI features in Jquery? At the very least, is there a similar modal dialog system? I've seen JqueryUI Dialog but it makes the background go dark and nonfunctional, which is not what I am looking for.

    Read the article

  • Filter y.output from bison or yacc?

    - by acidzombie24
    I am using bison and its difficult to figure out the conflicts by looking at y.output. Is there a tool to make or filter y.output so its more useful? i would love to see the full path to the state with the conflict but anything helpful is what i would like.

    Read the article

  • svn merge from trunk to branch conflict for a file deleted in the trunk

    - by Riccardo Galli
    After a subversion merge from trunk to branch, I got a conflict because a file has been deleted in the trunk and modified in the branch. I would like to keep the trunk choice, but using "svn resolve --accept theirs-full" from the branch directory tells me svn: warning: Tree conflicts can only be resolved to 'working' state; '/path/to/file' not resolved What should I do to have the file correctly deleted in the branch ?

    Read the article

  • ReSharper Code Cleanup/Reformat Code feature vs Versioning Control Systems

    - by Romain Verdier
    ReSharper Code cleanup feature (with "reorder members" and "reformat code" enabled) is really great. You define a layout template using XML, then a simple key combination reorganizes your whole source file (or folder/project/solution) according to the rules you set in the template. Anyway, do you think that could be a problem regarding VCS like subversion, cvs, git, etc. ? Is there a chance that it causes many undesired conflicts ? Thank you.

    Read the article

  • How to store wiki sites (vcs)

    - by Eugen
    Hello, as a personal project I am trying to write a wiki with the help of django. I'm a beginner when it comes to web development. I am at the (early) point where I need to decide how to store the wiki sites. I have three approaches in mind and would like to know your suggestion. Flat files I considered a flat file approach with a version control system like git or mercurial. Firstly, I would have some example wikis to look at like http://hatta.sheep.art.pl/. Secondly, the vcs would probably deal with editing conflicts and keeping the edit history, so I would not have to reinvent the wheel. And thirdly, I could probably easily clone the wiki repository, so I (or for that matter others) can have an offline copy of the wiki. On the other hand, as far as I know, I can not use django models with flat files. Then, if I wanted to add fields to a wiki site, like a category, I would need to somehow keep a reference to that flat file in order to associate the fields in the database with the flat file. Besides, I don't know if it is a good idea to have all the wiki sites in one repository. I imagine it is more natural to have kind of like a repository per wiki site resp. file. Last but not least, I'm not sure, but I think using flat files would limit my deploying capabilities because web hosts maybe don't allow creating files (I'm thinking, for example, of Google App Engine) Storing in a database By storing the wiki sites in the database I can utilize django models and associate arbitrary fields with the wiki site. I probably would also have an easier life deploying the wiki. But I would not get vcs features like history and conflict resolving per se. I searched for django-extensions to help me and I found django-reversion. However, I do not fully understand if it fit my needs. Does it track model changes like for example if I change the django model file, or does it track the content of the models (which would fit my need). Plus, I do not see if django reversion would help me with edit conflicts. Storing a vcs repository in a database field This would be my ideal solution. It would combine the advantages of both previous approaches without the disadvantages. That is; I would have vcs features but I would save the wiki sites in a database. The problem is: I have no idea how feasible that is. I just imagine saving a wiki site/source together with a git/mercurial repository in a database field. Yet, I somehow doubt database fields work like that. So, I'm open for any other approaches but this is what I came up with. Also, if you're interested, you can find the crappy early test I'm working on here http://github.com/eugenkiss/instantwiki-test

    Read the article

  • Coexisting installation of visual studio 2010 &2008

    - by yCalleecharan
    Hi, I currently have MVS2008 and I want to try the 2010 version hoping that it would compile C programs faster. I would like to know if I can have a 2008 installation coexisting with a 2010 installation on the same Windows partition, without conflicts in the Windows environment variables in Win XP. Thanks a lot...

    Read the article

  • Do your admins modify your web.config files?

    - by mcass20
    I'm wondering how other developers are handling source code conflicts for config files when system admins modify them in production. For example, if a system admin updates a appsettings key on the production server and then my team publishes out a project, it will overwrite that key. How do you handle config file updates in your organization?

    Read the article

  • git merge should ignore one directory

    - by dorelal
    I have tons of data in directory called reports. While doing git merge with another branch I am getting lots of conflicts for files under reports directory. I would like git merge to ignore files under reports. In another words I would like all the data from reports from master and not from lab branch. Is that possible? This is what I am doing right now. git checkout master git merge lab

    Read the article

< Previous Page | 5 6 7 8 9 10 11 12 13 14 15 16  | Next Page >