Search Results

Search found 3156 results on 127 pages for 'tortoise git'.

Page 56/127 | < Previous Page | 52 53 54 55 56 57 58 59 60 61 62 63  | Next Page >

• 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

• Many small scripts, one repository or multiple?

  - by The Jug

  A co-worker and myself have run into an issue that we have multiple opinions on. Currently we have a git repository that we are keeping all of our cronjobs in. There are about 20 crons and they are not really related except for the fact that they are all small python scripts and essential for some activity. We are using a fabric.py file to deploy and a requirements.txt file to manage requirements for all of the scripts. Our issue is basically, do we keep all of these scripts in one git repository or should we be separating them out into their own repositories? By keeping them in one repository it is easier to deploy them onto one server. We can use just one cron file for all the scripts. However this feels wrong, as the 20 cronjobs are not logically related. Additionally, when using one requirements.txt file for all the scripts, it's hard to figure out what the dependencies are for a particular script and they all have to use the same versions of packages. We could separate all of the scripts out into their own repositories but this creates 20 different repositories that need to be remembered and dealt with. Most of these scripts are not very large and that solution seems to be overkill. A related question is, do we use one big crontab file for all cronjobs, or a separate file for each? If each has their own, how does one crontab's installation avoid overwriting the other 19? This also seems like a pain as there would then by 20 different cron files to keep track of. In short, our main question and issue is do we keep them all closely bundled as one repository or do we separate them out into their own repository with their own requirements.txt and fabfile.py? We feel like we're also probably looking over some really simple solution. Is there an easier way to deal with this issue?

  Read the article

• How do I make git use the editor of my choice for commits?

  - by brass-kazoo

  For example, I would prefer to write my commit messages in vim, but it is opening emacs. How do I configure git to always use vim instead? Note that I want to do this globally, not just for a single project.

  Read the article

• Lost my commit in GIT. Can you accidentally delete commits?

  - by baash05

  I'm using git gui and I can't see my branch. I know I checked something in today. I changed to an earlier branch after I did my commit and verified it with the branch viewer. I made changes to the earlier branch and then wanted to go back to my current branch, but I can't see it any more. Any help would be great.

  Read the article

• Git Submodules: Is it possible to have more than one URL for each?

  - by Silas

  I was wondering if it is possible to have more than one URL for each git submodule. It would be interested to have more than one source of it if one of them is down or someone is behind a proxy that blocks one of them. Have you ever had this problem? How would you solve it?

  Read the article

• Keeping files that are often changed in sync between desktop and laptop

  - by N.N.

  I'm looking for a way to keep a desktop and a laptop in sync. What I want to keep in sync are some folders, mainly ~/Documents, that are changed often when working on them. If it matters I can connect to my desktop from anywhere via an URL but my laptop is harder to access since it might be behind NAT and such. I have been looking at Ubuntu One but it seems to not go well with working on documents written in LaTeX. If I work on a .tex file in the Ubuntu One directory and compile it (with pdflatex) every now and then (as often as every 10 sec when working) it will create several new files including a pdf which are uploaded to Ubuntu One and this seems stupid since it will create continuous upload when working on .tex files. I also usually keep .tex documents version controlled by git and then every commit (which also can happen frequently) will cause upload (by changes in ./.git) so that it happens continuously when working. Another example is editing images that are saved often. What I think would be best is for sync to happen every tenth minute or at the end of every working session (but there might be some other way to handle this?).

  Read the article

• git tmbundle for textmate - where is the checkout for the branch?

  - by Luca

  hi! i'm actually using the git tmbundle for textmate. really useful! unfortunately i miss the checkout, so i can't "merge" the branch to the master. anyone know where is it? thanks in advance :)

  Read the article

• How do I change the author of a commit in git?

  - by Flávio Amieiro

  I was writing a simple script in the school computer, and commiting the changes to git (in a repo that was in my pendrive, cloned from my computer at home). After several commits I realized I was commiting stuff as root. Is there any way to change the autor of this commits to my name?

  Read the article

• Why are GIT and Mercurial so similiar, who copied who? [closed]

  - by Blankman

  Both Git and Mercurial seem very similiar, even down to the commands. Did one copy the other?

  Read the article

• In git, what is the difference between merge --squash and rebase?

  - by GiH

  I'm new to git and I'm trying to understand the difference between a squash and a rebase. As I understand it you perform a squash when doing a rebase.

  Read the article

• Steps to send patch to Launchpad

  - by Alois Mahdal

  With a Git/Github background and knowing very little about Bazaar VCS, I would like to occasionally report a bug to Launchpad and even send a patch. I'd like to do it in a "proper" way so that it's ready for merging or improvement while not getting in way. I can't seem to find a decent simple How-to suited for my needs. So what I did so far: I have created a Launchpad account, reported the bug, installed Bazaar and setup SSH keys etc. Now if it was Github, I'd fork the repo, clone the forked repo, create a sanely named branch and do the work, commit + push, create a pull request using Github WUI. But it's not Github, and both LP and Bazaar architectures seem quite different from their Github/Git cunterparts. So could a kind soul save me from drowning in tons of documents and complile a straightforward step path, mainly the second part? Possibly including relevant CLI commands when they are needed? Edit: It seems that I should clarify if I'm asking specifically about Ubuntu packages (whatever it means) or Launchpad packages. I don't really care much about distinction between Ubuntu packages and non-Ubuntu packages. Any software could be in Ubuntu today and out of it tomorrow, or vice-versa. The development is what matters much more than distribution. Ao I was assuming that not every single package distributed in Ubuntu is hosted on Launchpad, an "official" or "default" workflow for Launchpad exists (well if all devs can agree on using Bazaar, why couldn't most of them agree on a patching workflow?), so I'm asking about the Launchpad way, not the Ubuntu way. And I chose AU because since the intersection is vast, I guess it's pretty on topic here.

  Read the article

• Leaving Github, how to change the origin of a Git repo?

  - by benoror

  I'm hosting a project in Github, but now I purchased a plan with Dreamhost that includes shell access and Git. Github [Origin] / \ pull/ \pull /push push\ / \ Laptop Dreamhost (cloned) (cloned) I would like to delete my repo from Github, and starting push directly to DH. How do I change origin in my Laptop, and should I delete the origin in Dreamhost?

  Read the article

• What's the equivalent of use-commit-times for git?

  - by Ben W

  I need the timestamps of files on my local and on my server to be in sync. This is accomplished with Subversion by setting use-commit-times=true in the config so that the last modified of each file is when it was committed. Each time I clone my repository, I want the timestamps of files to reflect when they were last changed in the remote repository, not when I cloned the repo. Is there any way to do this with git?

  Read the article

• Are there any good graphical git and hg/Mercurial clients on Mac OS X?

  - by DASKAjA

  I'm searching for compelling git and Mercurial clients on Mac OS X. The most clients I've found so far were less compelling as I expected. Some of the clients are programmed even in ruby or tcl/tk, which IMO aren't good OSX citizens in regard of integration in the OS. I've clients in mind similar to Versions.app or Cornetstone which are subversion-only clients. Perhaps somebody got an insider tip for me.

  Read the article

• How do I show just the names and commit titles since a tag in git?

  - by chrispix

  I'm trying to use tags for release management in git--I create a tag for each release. I'd like to be able to create release notes by listing the comment titles for every commit since a tag, or between 2 tags. I can't seem to find any way to do this.

  Read the article

• How do I make git post-receive emails be sent from the commit author?

  - by Jonathan Tran

  I'm using the post-receive-email script included with git. (Source is here.) It works just fine, but I want each email to be sent from the author of the commits pushed. How do I do it? My post-receive file currently looks like this, and I want to customize the from-email-address. #!/bin/sh export [email protected] $(dirname $0)/post-receive-email

  Read the article

• Trac/SVN to DVCS Migration

  - by quanticle

  The project I'm currently working on is using Trac, with SVN integration. It's worked great until now. Now, however, we've taken on some additional developers and we're running into issues with branching and merging. Because of this, I think a move to a distributed version control system is in order. The problem is that Trac is very closely integrated with the SVN repository. We have tight integration between the tickets and the revision numbers of code changes corresponding to those tickets. In addition we have a support wiki that has a lot of data that helps the tech. support team. Is there a way we can migrate to git or mercurial without losing the benefits of Trac? I've looked at the git plugin for Trac, and I'm unsure of how well it works. Has anyone here used it with a project that's been migrated from SVN? EDIT: I should note that the most important priority for us is maintaining the links between Trac tickets and the corresponding changesets in SVN. That's a tool that we use every day, and it provides an easy way to jump to code changes when reviewing tickets. Wiki migration would be nice to have, but if it's not possible, we can continue to run the old system whilst we write some kind of a one-off script to migrate the content.

  Read the article

• What's the best way to manage reusable classes/libraries separately?

  - by Tom

  When coding, I naturally often come up with classes or a set of classes with a high reusability. I'm looking for an easy, straight-forward way to work on them separately. I'd like to be able to easily integrate them into any project; it also should be possible to switch to a different version with as few commands as possible. Am I right with the assumption that git (or another VCS) is best suited for this? I thought of setting up local repositories for each class/project/library/plugin and then just cloning/pulling them. It would be great if I could reference those projects by name, not by the full path. Like git clone someproject. edit: To clarify, I know what VCS are about and I do use them. I'm just looking for a comfortable way to store and edit some reusable pieces of code (including unit tests) separately and to be able to include them (without the unit tests) in other projects, without having to manually copy files. Apache Maven is a good example, but I'm looking for a language-independent solution, optimally command-line-based.

  Read the article

• Is there a method to update all of my textmate bundles at once from the git repository?

  - by Barb

  I am trying to update all of my Textmate bundles to the most current version. Is there a way to do this without doing each bundle individually? If not how do I update an individual bundle? I don't know how to use svn so I would prefer to use the git repository. Thanks for helping a noob! :)

  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

• What is the standard or best way to deal with database branching with Mercurial or Git branches?

  - by Chad Johnson

  This has been a big question mark on my mind. I'm moving to Mercurial or Git very soon for my web software, and sometimes my branches require significant database changes which other branches should not see. This, I can't always share the same database for my branches. Is there some standard way of dealing with database changes for branching and cloning? What do you all do? I'm using MySQL.

  Read the article

• How to push a local git repository to another computer?

  - by nubela

  Hi, I have a local git repository setup on my laptop. I would like to push it to my desktop, how can I do that? Thanks.

  Read the article

• How to find commits by a specific user in Git?

  - by user285020

  Our project uses Git as the version control system and recently I needed to review someone's commits. How can I see a list of commits made by a specific user?

  Read the article

• In git, how do I check out a remote repository's remote branches?

  - by Hans Sjunnesson

  I have a local repository cloned from a bare remote repository. The following command lists al the remote repository's branches. $ git ls-remote 74bd3eb190edb39db04f6c0c4dbbb9e1e96bc6db refs/remotes/test 85de54d6ae813c624b9623983e6b0a4948dae0fe refs/remotes/trunk I want to checkout and track that remote's remote branch trunk. How do I do that?

  Read the article

• Why is GIT and Mercurial so similiar, who copied who?

  - by Blankman

  Both Git and Mercurial seem very similiar, even down to the commands. Did one copy the other?

  Read the article

< Previous Page | 52 53 54 55 56 57 58 59 60 61 62 63  | Next Page >