Re: [git-users] Re: How to resolve merge conflicts on octopus merges

Unsubscribe Sent from my iPhone > On May 16, 2022, at 7:20 AM, Philip Oakley wrote: > >  > One of the big unstated aspects is the distinction between --automatic and > --interactive expectations. The main Git project has the assumption of > --automatic merges without any need for user inter

Re: [git-users] Re: How to implement WebRTC as a Git Protocol?

Hi Git Noob, Supplemental to Konstantin's info, there is further details of the various protocols in the https://github.com/git/git/tree/master/Documentation/technical directory to complement the man pages. Hope that helps On Monday, February 21, 2022 at 10:46:45 AM UTC Konstantin Khomoutov w

Re: [git-users] Re: How to implement WebRTC as a Git Protocol?

On Sat, Feb 19, 2022 at 11:42:33AM -0800, git noob wrote: > > https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols > > https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols > > > > Is there a way to use plumbing commands (internal transfer protocols?) to > > implement your own

Re: [git-users] Re: How to print out a git repo (local)

On Wed, Dec 22, 2021 at 08:43:16AM -0800, David McMurrey wrote: > Okay, let's say each of my committed files is a chapter in a book, or each > committed file is some piece of Perl code I'm writing. I want to see the > actual HTML page or Perl code ready to use. > > I think my answer is that t

Re: [git-users] Re: How to make git work!

On 06/05/2020 08:06, SJW wrote: > Thanks Philip. > I have that mental model right.  I get that bit, Been there... Often it's the confusion between the intellectual model, our heuristics and our unthinking models that cause these problems. Every now and then I still get 'pulled up short' by some as

Re: [git-users] Re: How to make git work!

On Wednesday, May 06, 2020 03:06:12 AM SJW wrote: > In the grand scheme of things - it probably doesn't matter but from a > cleanliness point of view, I'd prefer to not have to commit comment > changes... From the peanut gallery: if you don't commit comment changes, how would you expect them to g

Re: [git-users] Re: How to make git work!

Hey, With "git add ." you just add files in your local directory. (I terribly hate when people use it if they are beginner with git, because they don't get how git works yet.) You can't amend a commit which is not on your computer, which is expected, since than you could modify others commit too.

Re: [git-users] Re: how to make a 'git add --patch' using --word-diff?

There has been a recent bit of movement on the Git list regardin "git add -p". See https://public-inbox.org/git/20180316101346.7137-1-phillip.w...@talktalk.net/ which may give you an option to discuss this ... Subject: [PATCH v3 0/3] add -p: select individual hunk lines - Original Message -

Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

be even worse, as you end up with some parts being merged cleanly from both sides (where there were no conflicts), and some parts totally dropping one of the sides (where conflicts appeared), as you already pointed out. Regards, Buga - Original Message - > *From:* Igor Djordjevic &

Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

-- From: Igor Djordjevic To: Git for human beings Sent: Thursday, July 13, 2017 8:58 PM Subject: Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master On Thursday, July 13, 2017 at 6:13:44 AM UTC+2, Maheshwaran A N wrote: On Thursday, 13 July 201

Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

On Thursday, July 13, 2017 at 6:13:44 AM UTC+2, Maheshwaran A N wrote: > > On Thursday, 13 July 2017 03:27:06 UTC+5:30, Igor Djordjevic wrote: >> >> On Wednesday, July 12, 2017 at 6:38:35 PM UTC+2, Yubin Ruan wrote: >>> >>> 2017-07-12 20:40 GMT+08:00 Maheshwaran A N : >>> >> > On Tuesday, 11 July

Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

Requirement is to keep all the changes of INT. When you have multiple files to solve the conflicts and you very well know which branch to retain, then why not use ours/theirs? Whats dangerous here? User is very clear on what needs to be retained. Also, if you retain INT content, there is no much

Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

On Wednesday, July 12, 2017 at 6:38:35 PM UTC+2, Yubin Ruan wrote: > > 2017-07-12 20:40 GMT+08:00 Maheshwaran A N >: > > On Tuesday, 11 July 2017 07:36:47 UTC+5:30, Anjaiah Yamagani wrote: > >> > >> Hi Team, > >> > >> I have very quick question - as I'm new to the git > >> > >> we have mast

Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

2017-07-12 20:40 GMT+08:00 Maheshwaran A N : > I suppose you are trying to execute the below commands. > > git checkout master > git merge origin/INT (taking changes from remote branch) or git merge INT > (merge with local changes) > At this point you would have faced the conflicts. > In this case

Re: [git-users] Re: How to get a highly complex branch straight?

Am Dienstag, 2. Mai 2017 21:07:18 UTC+2 schrieb Philip Oakley: > > > I think you may have had expectations which were too high. Git can not do > magic. > All I'm asking for is to replay the already recorded history. Shouldn't require magic. > I think your project had two lines of develop

Re: [git-users] Re: How to get a highly complex branch straight?

Am Dienstag, 2. Mai 2017 19:30:33 UTC+2 schrieb Michael Gersten: > > > On 2017-05-02, at 10:22 AM, m...@jump-ing.de wrote: > > Now I have a branch with 4700 commits on it, but zero merges. Diff melted > down to 3800 lines. That's something I can work with. > > Go home message: merges are evil!

Re: [git-users] Re: How to get a highly complex branch straight?

Tuesday, May 02, 2017 6:30 PM Subject: Re: [git-users] Re: How to get a highly complex branch straight? On 2017-05-02, at 10:22 AM, m...@jump-ing.de wrote: As nobody knew an answer, so I started trying rebase strategies (-s, -X options), one by one. Using 'git rebase -s recur

Re: [git-users] Re: How to get a highly complex branch straight?

On 2017-05-02, at 10:22 AM, m...@jump-ing.de wrote: > > As nobody knew an answer, so I started trying rebase strategies (-s, -X > options), one by one. Using 'git rebase -s recursive -X ours ...' was the > only one which did something useful for this self-rebase and also worked with > a mange

Re: [git-users] Re: How to make pack remote repository on every push?

Another solution could be running git-repack. This SO answer[1] has some nice details on it. Best, Gergely [1] http://stackoverflow.com/a/8638219 On 8 Jan 2016 02:29, "Steinar Bang" wrote: > > Gergely Polonkai : > > > You may want to play with gc.pruneexpire. From man git-config: > > >

Re: [git-users] Re: How to make pack remote repository on every push?

Hello, You may want to play with gc.pruneexpire. From man git-config: gc.pruneexpire >When git gc is run, it will call prune --expire 2.weeks.ago. >Override the grace period with this config variable. The value >"now" may be used to disable this grace pe

Re: [git-users] Re: How to move manually-versionned files to git (version control)?

On Wed, Nov 26, 2014 at 8:52 AM, Konstantinos Mavroudakis < kmavrouda...@gmail.com> wrote: > From "zero" source control :) i.e. no source control > ​My bad. When you said "import their comments", I just ASSuMEd that those comments already existed in another source control system.​ Going back

Re: [git-users] Re: How to move manually-versionned files to git (version control)?

>From "zero" source control :) i.e. no source control On Wednesday, November 26, 2014 4:48:02 PM UTC+2, John McKown wrote: > > On Wed, Nov 26, 2014 at 8:35 AM, Konstantinos Mavroudakis < > kmavro...@gmail.com > wrote: > >> Thank you ! >> >> I suppose that there is no formal way to import all

Re: [git-users] Re: How to move manually-versionned files to git (version control)?

On Wed, Nov 26, 2014 at 8:35 AM, Konstantinos Mavroudakis < kmavrouda...@gmail.com> wrote: > Thank you ! > > I suppose that there is no formal way to import all of these in git. Is > n't it? I expected that there would be such documented procedure or > command(!) in git (or other version control s

Re: [git-users] Re: How to recover from a "Detached Head"

On Mon, 3 Nov 2014 13:53:51 -0800 (PST) Anthony Berglas wrote: > > For instance, you take for granted that everyone would use > > `git commit -a` for a start and then may be try using "advanced" > > stuff. But as one example, here at my $dayjob a bunch of webdevs > > hired about 2-3 month ago us

Re: [git-users] Re: How to recover from a "Detached Head"

> > > git fetch origin > git merge origin/master > OK, maybe safer. For instance, you take for granted that everyone would use > `git commit -a` for a start and then may be try using "advanced" stuff. > But as one example, here at my $dayjob a bunch of webdevs hired about > 2-3 month a

Re: [git-users] Re: How to recover from a "Detached Head"

On Sun, 2 Nov 2014 18:26:15 -0800 (PST) Anthony Berglas wrote: > Thank you for all your very considered replies. The solution I end > ed up using (without the complex explanations) was > > git push > # fail > git pull > git merge origin/master This step is not needed: `git pull`, when you're o

Re: [git-users] Re: How to recover from a "Detached Head"

you can take a look at http://git-scm.com/book/en/v2/Git-Branching-Remote-Branches#Pulling Or http://git-scm.com/docs/git-pull 2014-10-31 4:18 GMT-03:00 Gergely Polonkai : > Hello, > > let me fix this up a bit: > > On 31 Oct 2014 04:39, "Rick Umali" wrote: > > > > On Thursday, October 30, 201

Re: [git-users] Re: How to recover from a "Detached Head"

Hello, let me fix this up a bit: On 31 Oct 2014 04:39, "Rick Umali" wrote: > > On Thursday, October 30, 2014 2:41:42 AM UTC-4, Anthony Berglas wrote: >> >> I am trying to do something really simple. I want to commit local changes to a remote repository. But along the way other developers modif

Re: [git-users] Re: how to add a new commit to the head of a branch, so that the branches have identical content?

On Wed, May 21, 2014 at 9:08 AM, wrote: > Perhaps the following command sequence works for you This looks like a good start, too, thanks everybody. Sam -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group an

Re: [git-users] Re: how to add a new commit to the head of a branch, so that the branches have identical content?

On Wed, May 21, 2014 at 9:08 AM, Bob Hiestand wrote: > It seems strange to use git (or other VCS) to store build products. Seems so, but Heroku, openshift, etc., all accept or require runnable apps to be git pushed. I don't want build products in the dev src tree, of course, only the branch to be

Re: [git-users] Re: how to add a new commit to the head of a branch, so that the branches have identical content?

It seems strange to use git (or other VCS) to store build products. To your question, the simplest approach would be something like this: git checkout dst rm -rf * git checkout src . git commit You can get a little more fancy if you want to reference the src branch as a parent, by replacing the

Re: [git-users] Re: how to add a new commit to the head of a branch, so that the branches have identical content?

On Tue, May 20, 2014 at 7:00 PM, Pierre-François CLEMENT wrote: > Okay then, in that case what you need is the --squash option of git-merge. > >> --squash, --no-squash Interesting idea, but I don't think it will work, since I don't want any of the build products from the last commit on the deplo

Re: [git-users] Re: how to add a new commit to the head of a branch, so that the branches have identical content?

Okay then, in that case what you need is the *--squash* option of git-merge . --squash, --no-squash > > Produce the working tree and index state as if a real merge happened > (except for the merge information), but do not actually make a commit, move > the HE

Re: [git-users] Re: how to add a new commit to the head of a branch, so that the branches have identical content?

On Tue, May 20, 2014 at 6:18 PM, Pierre-François CLEMENT wrote: > Do you *need* a new commit on top of the DST branch? Yes, I can't just reset it, because the will blow away the history, I'll lose the old commits that I built and committed, so won't be able to roll back the application. > Le me

Re: [git-users] Re: How to commit chnages made on a read only repository code onto another repository I have write permission?

Thank you for the suggestion. Is it possible to fork out the read only repo as a subfolder into my existing repo? Eg:- *g...@github.com:B/fullAcces.git/Folder1/folderWithCodeFromReadOnlyRepo* On Wednesday, 19 February 2014 19:10:57 UTC, Nelson Efrain A. Cruz wrote: > Maybe you need t

Re: [git-users] Re: How to commit chnages made on a read only repository code onto another repository I have write permission?

Maybe you need to fork the read only repository, i mean clone te read only repo and make the changes you need in this repo, then you can use the forked repo as a submodule in your main repository. In this way you will be able to track your changes in the forked repo. Anyway I don't know if is the

Re: [git-users] Re: How to get the list of files "renamed" since the last commit ?

On 5 Sep 2013 08:16, "Thomas Ferris Nicolaisen" wrote: > > > > On Thursday, September 5, 2013 7:31:04 AM UTC+2, Jean-Michel FAYARD wrote: >> >> I want to be able to rename as freely as possible the filenames that are on my github repository >> The thing is that I don't want to have ugly broken lin

Re: [git-users] Re: How to boost git performance on Windows

On Tuesday, July 23, 2013 7:27:07 AM UTC+2, Teddy wrote: > > > *I noticed the git fetch on each repos (~200 MB) takes longer time (5 > seconds), on linux ~ 1 second.* > 5 seconds sounds bearable. You have to ask yourself if this is fast enough. If you already have SSD's, the next step would b

Re: [git-users] Re: How to boost git performance on Windows

Dear all, > >> Has anyone got ideas to boost the git performance on windows? >> >> I am testing git on windows 2012 64 bit server (testing environment) with >> latest git 1.8.3. >> Intel Xeon @2.5 GHz 12 cores (24 threads) with 32 GB RAM. >> >> Here are the tweaks i've done so far : >> - uninstall

Re: [git-users] Re: how to ?

On Fri, 19 Jul 2013 23:31:04 -0700 (PDT) Syaifull Al-Bandary wrote: > thank you, your answer. I would probably ask for a lot of time to > come. > > we need your clarification on git, to make us understand. please, > continue the explanation. [...] I'm not sure what do you mean -- I tried to ex

Re: [git-users] Re: How to disable or fix Auto packing with git remote repository

I think this came up recently (last 6-9 months) on the main Git list. Try the archives on Gmane - a quick search with your text phrase got http://thread.gmane.org/gmane.comp.version-control.git/217137/focus=217193 which may be of relevance (I didn't read) Philip - Original Message -

Re: [git-users] Re: How to deal with concurrent changes in a project

It is easy to use Git 'the wrong way' when transferring over from other styles of version control. Most old styles of version control (including what most people think in their head) have a master-slave copy viewpoint. This assumes that there is a single 'master' (both the respository and its

Re: [git-users] Re: how to connect the two local machine in order use git

you may want to read this http://stackoverflow.com/questions/377213/git-serve-i-would-like-it-that-simple > > From: Manjunath Hv >To: git-users@googlegroups.com >Sent: Thursday, 6 June 2013 3:54 PM >Subject: [git-users] Re: how to connect the two local machine

Re: [git-users] Re: how to connect the two local machine in order use git

On Thu, Jun 06, 2013 at 12:09:57AM -0700, Manjunath Hv wrote: > Hi Philip, > > Please find the details below > > Machines : One is Windows 7 & other is windows XP > Version : 1.8.1.msysgit.1 > I can see the file as well as directories on other system. Will u please > tell me how to check

Re: [git-users] Re: How to organise the workflow

> From: Philip Oakley > > Update > Just found > http://git.661346.n2.nabble.com/gitk-pays-too-much-attention-to-file-timestamps-td4861833.html > "git update-index --refresh -q" (may need a trailing '*') appears to be the > plumbing command > (see third item *Jonathan > Nieder-2*

Re: [git-users] Re: How to convert SVN tags to Git

On Thu, Jan 24, 2013 at 01:37:54PM -0800, Luís de Sousa wrote: > For future reference, the full account of how dealt with this issue can be > read my blog[1]. > > Thank you all for the guidance to this solution, Thanks for summarising and sharing. That's a really good practice. --

Re: [git-users] Re: How to convert SVN tags to Git

On Tue, 22 Jan 2013 05:44:17 -0800 (PST) Luís de Sousa wrote: [...] > Now the issue is that I have no master branch, but all the oldre > branches cloned. Can I just rename the most recent branch and delete > the older branches? This is a rather philosophical question. The special treatment of t

Re: [git-users] Re: How to uninstall Git on Centos 6.x

On Thu, Nov 01, 2012 at 12:16:14AM -0700, Михаил Меньшинский wrote: > > I have installed Git from source on a Centos 6.x server. Would anyone > > know how to properly uninstall the source version? I would like to upgrade > > to an RPM version. > > > How do you remove it? I have the similar pro

Re: [git-users] Re: how to to check if a branch has changes not present in master?

On Wednesday, August 29, 2012 2:21:54 PM UTC+2, Michael Haggerty wrote: > > On 08/28/2012 04:51 PM, Fred wrote: > > git rev-list ist great, but it doesn't work for cherry picked commits > > > > do a cherry-pick commit from branchB into master. git rev-list > > master..branchB would show sha1

Re: [git-users] Re: how to to check if a branch has changes not present in master?

On 08/28/2012 04:51 PM, Fred wrote: > git rev-list ist great, but it doesn't work for cherry picked commits > > do a cherry-pick commit from branchB into master. git rev-list > master..branchB would show sha1 of the commit in branchB. > But the change itself is already in master (cherry-picked and

Re: [git-users] Re: how to to check if a branch has changes not present in master?

On Wednesday, August 29, 2012 4:11:23 AM UTC+2, Michael Wang wrote: > > I have tried git diff master... which also have this issue, the > cherry-picked change is showing in the output. You are right. that's because the way it works. it finds last commit in master where branchB was forked and

Re: [git-users] Re: how to to check if a branch has changes not present in master?

I have tried git diff master... which also have this issue, the cherry-picked change is showing in the output. 2012/8/28 Fred > > > On Tuesday, August 28, 2012 3:26:15 PM UTC+2, Michael Wang wrote: >> >> try git rev-list, following is an exmaple: >> >> loveky@LOVEKY-PC ~/test/test (dev) >> $ g

Re: [git-users] Re: how to to check if a branch has changes not present in master?

On Tuesday, August 28, 2012 5:13:39 PM UTC+2, donnoman wrote: > > git diff master.. > > Would give you what's in your current branch since master > > git diff ..master > > Would show you commits in master that your local branch doesn't have > > git diff ...master > > Or > > git diff master.

Re: [git-users] Re: how to to check if a branch has changes not present in master?

git diff master.. Would give you what's in your current branch since master git diff ..master Would show you commits in master that your local branch doesn't have git diff ...master Or git diff master... Would show you all commits that your branch and master do not share I only find the 3 d

Re: [git-users] Re: how to to check if a branch has changes not present in master?

On Tuesday, August 28, 2012 3:26:15 PM UTC+2, Michael Wang wrote: > > try git rev-list, following is an exmaple: > > loveky@LOVEKY-PC ~/test/test (dev) > $ git log --oneline master > 1874792 4 > 8ed7a1e 3 > a224756 2 > 34b4b11 1 > > loveky@LOVEKY-PC ~/test/test (dev) > $ git log --oneline dev > f

Re: [git-users] Re: how to to check if a branch has changes not present in master?

Hi.. On Tue, Aug 28, 2012 at 6:02 PM, Fred wrote: > > > On Tuesday, August 28, 2012 1:15:08 PM UTC+2, Tim Chase wrote: >> >> On 08/28/12 05:47, Tim Chase wrote: >> > On 08/28/12 03:13, Fred wrote: >> >> is there a way to check if a branch doesn't introduce changes, >> >> which are not in master.

Re: [git-users] Re: how to to check if a branch has changes not present in master?

try git rev-list, following is an exmaple: loveky@LOVEKY-PC ~/test/test (dev) $ git log --oneline master 1874792 4 8ed7a1e 3 a224756 2 34b4b11 1 loveky@LOVEKY-PC ~/test/test (dev) $ git log --oneline dev fd0c922 5 a224756 2 34b4b11 1 loveky@LOVEKY-PC ~/test/test (dev) $ git rev-list master..dev

Re: [git-users] Re: how to change message of old commit

On Mon, Jul 23, 2012 at 11:54 AM, Thomas Ferris Nicolaisen wrote: > > Could you point me to that 'git-bash thing'? -- Looks very useful >> > > Note that it only works for zsh (z-shell) and bash, so you'll need to run > either Linux, Mac, or Windows with Cygwin (or Git Bash). > > In the above shel

Re: [git-users] Re: how to change message of old commit

> Could you point me to that 'git-bash thing'? -- Looks very useful > Note that it only works for zsh (z-shell) and bash, so you'll need to run either Linux, Mac, or Windows with Cygwin (or Git Bash). In the above shells, you have a variable called the PS1 which value appears in front of you

Re: [git-users] Re: how to change message of old commit

On Sun, Jul 22, 2012 at 2:18 AM, Thomas Ferris Nicolaisen wrote: > Well I can kinda see the parallel to vim when it comes to learning curve. > Git certainly has some areas where the ui can be improved, and the good > thing is that they are continuously making small steps to improve it (while > vim

Re: [git-users] Re: how to change message of old commit

Well I can kinda see the parallel to vim when it comes to learning curve. Git certainly has some areas where the ui can be improved, and the good thing is that they are continuously making small steps to improve it (while vim is pretty frozen by now). There are a few "modes" I often use. Git do

Re: [git-users] Re: how to change message of old commit

On Sat, Jul 21, 2012 at 07:43:31AM +0530, Rustom Mody wrote: > > I suspect that you are in "rebase mode". That is, you're in the middle of > > rewriting som history, and Git is waiting for you to type things like "git > > rebase --abort" or "git rebase --continue". If you just want to get out of >

Re: [git-users] Re: how to change message of old commit

On Sat, Jul 21, 2012 at 2:25 AM, Thomas Ferris Nicolaisen wrote: > I suspect that you are in "rebase mode". That is, you're in the middle of > rewriting som history, and Git is waiting for you to type things like "git > rebase --abort" or "git rebase --continue". If you just want to get out of > t

Re: [git-users] Re: how to merge to separate repositories.

The fact that all commit tags change is a bit of a nuisance, but I haven't found any way to avoid it. I am hoping that grafting is really a one time occurrence :) nick On Thu, Jun 28, 2012 at 5:12 PM, Tim Chase wrote: > On 06/28/12 13:44, Philip Oakley wrote: >> You can use Grafts > > Always ha

Re: [git-users] Re: how to get the formated patches from the merge id

On Fri, Jun 15, 2012 at 7:59 PM, Vincent van Ravesteijn wrote: > Op 15-6-2012 13:46, lei yang schreef: > >> Hi >> >> I mean, >> >> I have a commit like below >> commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429 >> Merge: b724cc1 51bfd29 >> >> This commit done this work: merge b724cc1..51bfd29 commit

Re: [git-users] Re: how to get the formated patches from the merge id

On Fri, 15 Jun 2012 19:46:22 +0800 lei yang wrote: > I have a commit like below > commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429 > Merge: b724cc1 51bfd29 > > This commit done this work: merge b724cc1..51bfd29 commit, This is a gross misunderstanding of how revision ranges work in Git. Please re

Re: [git-users] Re: how to get the formated patches from the merge id

Hi I mean, I have a commit like below commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429 Merge: b724cc1 51bfd29 This commit done this work: merge b724cc1..51bfd29 commit, The question is how could I *onlys* through 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the formated patch for the commit(b

Re: [git-users] Re: How to merge two independent projects one commit by one commit?

On Tue, 18 Oct 2011 07:17:39 -0700 (PDT) www wrote: > May I ask you one more question just for my learning purpose? If I ask > my partner who works in a different company also use git, when he > sends me the files he modified and together with .git/ directory. I > can put all his files AND .git u

Re: [git-users] Re: How to merge two independent projects one commit by one commit?

On Tue, 18 Oct 2011 05:45:01 -0700 (PDT) www wrote: [...] > However, most--i intend to say all-- git tutotials are half-baked, > including some well-cited tutorials. It seems nobody has the patience > to write it down and show other people and just let other people--like > me-- to struggle and fi

Re: [git-users] Re: How to "move" the master?

Hi, > If it's just a local repository (probably not) you can just rename the > branches, I'll use the branch name dev_branch to stand in for your > feature branch: > > git branch -m master old_master > git branch -m dev_branch master How about if I have shell access to the server where the projec

Re: [git-users] Re: How to migrate to git from two SVN repositories?

On 9/6/10, Mark Kharitonov wrote: > @Rouleau: Thanks for the reply. > > Nope. I have two SVN repositories, where: > - the first repository is the repository before the old VCS crashed. > - the second repository contains all the dev code since the crash with > the history starting from the cras

Re: [git-users] Re: How to "move" the master?

On Fri, Aug 13, 2010 at 2:44 PM, David Bruce wrote: > Hi, > > Along these lines, we are in a somewhat similar situation.  Basically, > we have had a major feature branch for a GSoC project, and this branch > has now substantially diverged from master.  However, the divergence > is almost completel

Re: [git-users] Re: How to "move" the master?

Hi, Along these lines, we are in a somewhat similar situation. Basically, we have had a major feature branch for a GSoC project, and this branch has now substantially diverged from master. However, the divergence is almost completely due to equivalent work that was done first in master, and then

Re: [git-users] Re: How to "move" the master?

On Thu, Aug 12, 2010 at 1:09 PM, jd wrote: > On Aug 12, 3:18 am, Konstantin Khomoutov wrote: >> >> That's because you created a situation known as "detached HEAD". >> >> > How can I fix this?  I want "master" to point to the same place as HEAD. >> >> Record the name of the commit HEAD points at,

Re: [git-users] Re: how to get back gitignore-like behavior?

I was underscoring the necessity of migrations to manage the the database. For example lets say before you ignored and deleted the sqlite files you had two developers both tracking your git repo. With those database files checked in, as you each pushed and pulled, you would either corrupt the dat

Re: [git-users] Re: how to get back gitignore-like behavior?

On a new checkout doing a rake db:create should create the requisite sqlite files if that's what you have specified in your database.yml. Then you would do a rake db:migrate to set up the schema. You may also check I think rails added a rake db:seed command to import seed data. If you have dat

Re: [git-users] Re: How to do a diff comparing a file in your workin directory against a branch or a particular commit?

On Wed, Mar 17, 2010 at 08:19:55AM -0700, vfclists wrote: > Thanks. > > Is the viewer in question a console based graphics or a GUI based one? > > Will it work in an SSH terminal? Both. It's configurable. The defaults ones are GUI based but you can easily configure it to use something like 'vi