Thanks for the reply.
I have one doubt which I want help on.
Say, I have three users : Tux, Alice and bob.
I ran the following commands:
$mkdir foo
$cd foo
$git init
$vi foo.rb
Code:
if (value == "test")
puts "I'm in!"
end
$git add foo.rb
$git commit -a
Here comes a second User Alice
$git clone /home/alice/foo master1
$cd master1
$vi foo.rb
Code:
if (value == "test")
puts "I'm in!"
end
Lets work with two users as for now.
Say Alice Made some changes in foo.rb at :
Alice's Machine
Code:
if (value == !"test"!)
puts "I'm in!"
end
On Tux Machine Say I made such entry
$sudo git add remote alice /home/alice/master1
$sudo git remote update
< it will show whats update from alice >
$sudo git merge alice/master
Now My Question is : How the conflict can be eradicated. Is it Tux or Alice who will do resolve the conflict.
If Alice then what are the steps?
Say, Tux noticed that during merging..Will he send mail to him?
How he gonna know why its conflicting?
I tried with
but that seems incomplete to understand.
Is it that ALICE gonna manually edit it..But how can he know what to and what not to.?
I am completely stucked!!
I tried removing
lines or doing
Code:
git reset --hard HEAD
and it gave me the original o/p but again its not merging.Have I screwed up?