Skip to contentSkip to conversation

git merge issues

DISCUSSION Raghavendra 6 participants 8 messages Jun 12, 2014

lore
Share & tools
lore
#0 lore raw

Hello everyone,

Assume that i have two branches in my repository: master and devel.

-- I've updated the master branch from the remote repository (using git pull).
Assume that the file name 'file.txt' has gone through an update.

-- Now the same file has also gone through a modification in the devel branch (manual editing)

-- Now when I do a 'git merge master' from my devel branch, I am facing a conflict issue something like this :

Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt Automatic merge failed; fix conflicts and then commit the result.

Now my question is that do I need to solve the merging issue manually or is there any way to solve this using git?

Thank you.
Raghavendra

-------------------------------------------------------------------------------------------------------------------------------
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may contain confidential and privileged information. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies and the original message. Any unauthorized review, use, disclosure, dissemination, forwarding, printing or copying of this email is strictly prohibited and appropriate legal action will be taken.
-------------------------------------------------------------------------------------------------------------------------------

#1 lore raw

Hi Raghavendra ,

AFAIK , you need to solve it manually and do git commit after this. This happens when git tries to resolve it but does know how to solve the same. Git will record the conflict resolution that you have done and in case the same kind of conflict occurs, it will resolve the conflict automatically based on your previous resolution.

Thanks,
--Vignesh

Quoted 41 lines · Raghavendra

Hello everyone,

Assume that i have two branches in my repository: master and devel.

-- I've updated the master branch from the remote repository (using git pull).
Assume that the file name 'file.txt' has gone through an update.

-- Now the same file has also gone through a modification in the devel branch (manual editing)

-- Now when I do a 'git merge master' from my devel branch, I am facing a conflict issue something like this :

Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt Automatic merge failed; fix conflicts and then commit the result.

Now my question is that do I need to solve the merging issue manually or is there any way to solve this using git?

Thank you.
Raghavendra

-------------------------------------------------------------------------------------------------------------------------------
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may contain confidential and privileged information. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies and the original message. Any unauthorized review, use, disclosure, dissemination, forwarding, printing or copying of this email is strictly prohibited and appropriate legal action will be taken.
-------------------------------------------------------------------------------------------------------------------------------

_______________________________________________
Kernelnewbies mailing list
Kernelnewbies at kernelnewbies.org
http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

Signature · 1 line
http://vigneshradhakrishnan.blogspot.com/
#2 lore raw
In reply to Raghavendra
Quoted 2 lines

Now my question is that do I need to solve the merging issue manually or is there any way to solve this using git?

This is in no way related to the Linux kernel. You should be asking this on the git mailing list.

Short answer - you will have to manually fix the conflict. Git could not do it automatically and hence it's asking you to fix it. After fixing the conflict, do 'git add <file>' and then 'git commit'.

HTH,
-mandeep

Quoted 21 lines

Thank you.
Raghavendra

-------------------------------------------------------------------------------------------------------------------------------
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may contain confidential and privileged information. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies and the original message. Any unauthorized review, use, disclosure, dissemination, forwarding, printing or copying of this email is strictly prohibited and appropriate legal action will be taken.
-------------------------------------------------------------------------------------------------------------------------------

_______________________________________________
Kernelnewbies mailing list
Kernelnewbies at kernelnewbies.org
http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

#3 lore raw
In reply to Raghavendra

http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts

andi

Quoted 41 lines · Raghavendra

Hello everyone,

Assume that i have two branches in my repository: master and devel.

-- I've updated the master branch from the remote repository (using git pull).
Assume that the file name 'file.txt' has gone through an update.

-- Now the same file has also gone through a modification in the devel branch (manual editing)

-- Now when I do a 'git merge master' from my devel branch, I am facing a conflict issue something like this :

Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt Automatic merge failed; fix conflicts and then commit the result.

Now my question is that do I need to solve the merging issue manually or is there any way to solve this using git?

Thank you.
Raghavendra

-------------------------------------------------------------------------------------------------------------------------------
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may contain confidential and privileged information. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies and the original message. Any unauthorized review, use, disclosure, dissemination, forwarding, printing or copying of this email is strictly prohibited and appropriate legal action will be taken.
-------------------------------------------------------------------------------------------------------------------------------

_______________________________________________
Kernelnewbies mailing list
Kernelnewbies at kernelnewbies.org
http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

#5 lore raw

回复: git download

And use "top" command, show the memory has used 90%+, but the CPU just 1%+.

jinzhao at wingtech.com

???? jinzhao at wingtech.com
????? 2014-06-12 14:32
???? kernelnewbies
??? git download
Hi,
Now we install git on servers, when we use "git clone" to download the code, the rate is too slow, how to speed the rate? Thanks!

__________ Information from ESET NOD32 Antivirus, version of virus signature database 9932 (20140612) __________

The message was checked by ESET NOD32 Antivirus.

http://www.eset.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140612/1eb97a31/attachment-0001.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: image/jpeg
Size: 27161 bytes
Desc: not available
Url : http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140612/1eb97a31/attachment-0001.jpe

#7 lore raw

git download

In reply to jinzhao at wingtech.com
Quoted 2 lines · jinzhao at wingtech.com

Now we install git on servers, when we use "git clone" to download the code, the rate is too slow, how to speed the rate?

a) You can just start it Friday as you leave the office, and it should be done by the time you get in on Monday.

b) Remember that if you want it on multiple machines, you can clone it to one
box, and then use that as the source of a clone to other boxes....
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 848 bytes
Desc: not available
Url : http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140612/881b6627/attachment.bin

#6 lore raw

?ظ?: git download

In reply to jinzhao at wingtech.com
Quoted 1 line · jinzhao at wingtech.com

And use "top" command, show the memory has used 90%+, but the CPU just 1%+.

This is not indication of a problem - Linux will intentionally try to keep potentially useful data cached in memory, so you should *normally* see memory 90-95% full..

Oh, and your swapspace is probably *way* too big - 8G of RAM and 24G of swap is just asking for trouble. 1G or 2G of swap is very useful to prevent an OOM if you get close to your RAM limit. But if you're dug much deeper into swap, you're probably thrashing so hard that you'll actually wish that you *did* OOM something and get control of your system back....

(And yes, there's times when 8G of RAM and 24G of swap makes sense. That's
like 0.1% of the time, and if you're the admin of such a system, you
probably aren't the type that will ask questions on kernelnewbies. ;)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 848 bytes
Desc: not available
Url : http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140612/5bbe8428/attachment.bin