[git-users] How to use git for web site development

Hello, What are rules to follow when you plant to use git for developing a web site? Firstly I tried to create lots of branches for each part of a web site (index, authentication, member page) but soon I faced lots of problems: 1) What I should do with database which is continuously modified

Re: [git-users] question about merge commits

This happens depending on how the history of the repos has diverged. Basically when you make a pull you are doing a fetch and a merge in the background. So there are two types of merges, one of them ends with a commit merge the other don't. It's better explained in

[git-users] Git diff problem with cvs $id$

I have two branches and the only difference between them is the cvs $id$, which is expanded in one branch and not expanded in the other. Is there a way to show git diff as unchanged? Also should not show conflict in case of git merge. Any suggestions? -- You received this message because

[git-users] question about merge commits

Guys, I have a question about merge commits. Now when I perform git pull from somebody. Sometimes I'm getting a merge commit where I should write a merge commit message. Sometimes it does not happen, I just hit the git pull and it pulls the updates without creating a merge commit. What is the

[git-users] Keeping history migrating .java to .scala

I want to migrate some legacy java code to scala whilst keeping git history intact for each file. The idea was to do a very basic conversion first, just doing ssyntactical changes first and have git mark it only as a rename and go from there. But already the basic syntax changes push git over

Re: [git-users] Keeping history migrating .java to .scala

On Wed, 1 Jul 2015 07:49:45 -0700 (PDT) Oliver Schrenk oliver.schr...@gmail.com wrote: I want to migrate some legacy java code to scala whilst keeping git history intact for each file. The idea was to do a very basic conversion first, just doing ssyntactical changes first and have git mark it

Re: [git-users] How to use git for web site development

See my two cents inline On 1 Jul 2015 20:01, m...@joketube.tv wrote: Hello, What are rules to follow when you plant to use git for developing a web site? Firstly I tried to create lots of branches for each part of a web site (index, authentication, member page) but soon I faced lots of

[git-users] Why commit --fixup uses commit message instead SHA of original commit in resulting commit message?

Let i have these commits: * task #2850 * task #2850 - #2961 Then i fixuping last commit: git commit --fixup= * bfbfbfbf fixup! task #2850 * task #2850 * task #2850 - #2961 And I perform interactive rebase. Result will be: * p task #2850 *