Re: [git-users] What to do when you get a conflict (rails) of schema.rb
Hmm. But it's a git-users question. Thanks anyway. On Wed, Aug 25, 2010 at 6:52 PM, Michael P. Soulier msoul...@digitaltorque.ca wrote: On 25/08/10 Pito Salas said: Hi all, This happens from time to time and I am not sure the right solution: Working on a rails application, I am merging my branch (where I did some migrations) with your branch (where you did some migrations too). Inevitably there's a conflict with schema.rb. What to do? I can manually fix the merge conflict, but I am still stuck with This is not a Git question. Mike -- Michael P. Soulier msoul...@digitaltorque.ca Any intelligent fool can make things bigger and more complex... It takes a touch of genius - and a lot of courage to move in the opposite direction. --Albert Einstein -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iD8DBQFMdZ64KGqCc1vIvggRAjuFAJ43MMt6vUmiXnFedjGjf94Sbm73AQCfUXhd 6hVM8pVV+a7osWmzcb1V7oI= =TV0p -END PGP SIGNATURE- -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] What to do when you get a conflict (rails) of schema.rb
Yeah it's a mystery to me: the question about checking in schema.rb is heavily debated and the rails code itself STRONGLY advises to check it in. But I don't know why because what you say makes perfect sense to me too. -- Pito On Thu, Aug 26, 2010 at 10:40 AM, Donovan Bray donno...@gmail.com wrote: Fwiw I recommend .gitignore'ing the schema.rb. You don't need it checked in its regenerated every migration and it's a magnet for useless conflicts. On Aug 26, 2010, at 7:20 AM, Pito Salas r...@salas.com wrote: Hmm. But it's a git-users question. Thanks anyway. On Wed, Aug 25, 2010 at 6:52 PM, Michael P. Soulier msoul...@digitaltorque.ca wrote: On 25/08/10 Pito Salas said: Hi all, This happens from time to time and I am not sure the right solution: Working on a rails application, I am merging my branch (where I did some migrations) with your branch (where you did some migrations too). Inevitably there's a conflict with schema.rb. What to do? I can manually fix the merge conflict, but I am still stuck with This is not a Git question. Mike -- Michael P. Soulier msoul...@digitaltorque.ca Any intelligent fool can make things bigger and more complex... It takes a touch of genius - and a lot of courage to move in the opposite direction. --Albert Einstein -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iD8DBQFMdZ64KGqCc1vIvggRAjuFAJ43MMt6vUmiXnFedjGjf94Sbm73AQCfUXhd 6hVM8pVV+a7osWmzcb1V7oI= =TV0p -END PGP SIGNATURE- -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: Small mystery
Thanks everyone, for the explanations. Extremely useful! One final nuance: What then does git fetch do different from git fetch origin ? - Pito On Wed, Apr 7, 2010 at 8:58 PM, Jeffrey jefr...@gmail.com wrote: A key note in git-fetch(1) is: A parameter ref without a colon is equivalent to ref: when pulling/fetching, so it merges ref into the current branch without storing the remote branch anywhere locally. That bit of the documentation seems a little off to me. There's no way that git fetch actually performs a merge. What it does is fetch the objects and update FETCH_HEAD to point to the fetched ref. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Small mystery
I thought I understood this but here's a puzzle for me: 1) Download jquery branch locally: $ git fetch origin jquery From github.com:trustthevote/ElectionManager * branchjquery - FETCH_HEAD Looks like it worked, right? 2) List all branches. Where is it? $ git branch -a converterimport develop domain_tables jurist_list master txballot * web-theme remotes/origin/HEAD - origin/master remotes/origin/converterimport remotes/origin/cucumber remotes/origin/develop remotes/origin/domain_tables remotes/origin/idents remotes/origin/master remotes/origin/mimic_nh_ballots remotes/origin/railroad remotes/origin/refactorrender remotes/origin/release-001 remotes/origin/singleballotimp remotes/origin/tgd_dev remotes/origin/txballot remotes/origin/web-theme remotes/origin/wicked_pdf remotes/origin/yaml_batch_import remotes/origin/ymlsupport Anyone see what's messing me up? Probably something stupid... Thanks! Pito -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Small mystery
The problem is that git fetch doesn't _create_ branches. When you downloaded the branch with git fetch origin jquery, it stored the ref locally as FETCH_HEAD (cat .git/FETCH_HEAD if you want to see the details). If you want to create a local branch based off of the remote jquery branch, you can git fetch git checkout -b jquery origin/jquery. The git fetch in this case is simply update all of my references to the origin repo, and git checkout -b jquery origin/jquery will create a local jquery branch based off of the origin/jquery reference. -- Wow, thanks. So to clarify: git fetch origin jquery does download the commits but not the branch (labels?) -- Pito -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Meaning of 'HEAD' vs. branch master
Hi all, What's the exact meaning of 'HEAD' ? Is it a tag or a branch, and what does it do/mean? When does one use it? And what might it mean when my remote repo says that there are two 'HEAD's, on different branches? Thanks!! Pito -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
