Le 21 sept. 2012 à 19:43, KP Kirchdoerfer a écrit :
> Am 21.09.2012 19:36, schrieb Yves Blusseau:
>>
>> Le 21 sept. 2012 à 18:29, KP Kirchdoerfer a écrit :
>>
>>> Am 21.09.2012 18:13, schrieb Yves Blusseau:
>>>>
>>>> Le 21 sept. 2012 à 17:47, KP Kirchdoerfer a écrit :
>>>>
>>>>> Hi;
>>>>>
>>>>> before I'm doing something wrong here, I'd like to ask how do I merge a
>>>>> a single commit (made to maint) into master?
>>>>>
>>>>> The commit in question is
>>>>> 8045dd5b69f48127d39fc1171c52e4be69b11993
>>>>>
>>>>> http://leaf.git.sourceforge.net/git/gitweb.cgi?p=leaf/bering-uclibc;a=commit;h=8045dd5b69f48127d39fc1171c52e4be69b11993
>>>>>
>>>>> btw: I've released 4.3.1-rc1 today and do not expect to see more changes
>>>>> for 4.3.1.
>>>>>
>>>>> thx kp
>>>>
>>>>
>>>> Hi KP,
>>>> never commit a single commit from maint to next. Next must be a superset
>>>> of maint. You need to merge maint into master like i wrote on the git
>>>> workflow:
>>>> https://sourceforge.net/apps/mediawiki/leaf/index.php?title=Bering-uClibc_5.x_-_Developer_Guide_-_Appendices_-_Git_Workflows#Recipe:_Update_master_branch_from_maint
>>>>
>>>> So you need to do a:
>>>> git checkout master
>>>> git pull --ff-only
>>>> git merge --no-commit maint
>>>>
>>>> Resolve conflicts then commit with a message like:
>>>> Sync with 4.3.1-rc1
>>>>
>>>> Then git push
>>>>
>>>> I can do it for you if you want.
>>>
>>> Hi Yves;
>>>
>>> thx for quick responding - I'll prefer to do myself, just to learn how
>>> to do.
>>>
>>> I followed your advice, and get
>>>
>>> git merge --no-commit maint
>>> Auto-merging repo/ulogd/buildtool.mk
>>> CONFLICT (content): Merge conflict in repo/ulogd/buildtool.mk
>>> Auto-merging repo/ulogd/buildtool.cfg
>>> Auto-merging repo/iptables/buildtool.cfg
>>> CONFLICT (content): Merge conflict in repo/iptables/buildtool.cfg
>>> Auto-merging repo/initrd/buildtool.cfg
>>> CONFLICT (content): Merge conflict in repo/initrd/buildtool.cfg
>>> Automatic merge failed; fix conflicts and then commit the result.
>>>
>>> Now, is there a quick way to see what is the CONFLICT?
>> use git status to see the files in conflict
>>
>>> I know from memory that e.g.
>>> CONFLICT (content): Merge conflict in repo/initrd/buildtool.cfg
>>> should be not part of the merge
>>> so I assume, I'll have to do
>>> git reset -p repo/initrd/buildtool.cfg
>> No, you need to resolve conflict "by hand".
>>
>> If you open the file you will see where the conflict are.
>> There are different ways to resolve conflicts.
>> * By hand with an editor.
>> * With the command git mergetool (which need to be configured to launch a
>> program like 'meld' to help resolving the conflict
>> * If you want to keep the version from master do: git checkout --ours file
>> * If you want to keep the version from maint do: git checkout --theirs file
>>
>> When you have finish to resolve a conflict do a: git add file
>>
>> Then when all conflicts are resolved do: git commit
>>
>> And give the message: Sync with 4.3.1-rc1
>>
>> Before pushing to the repository:
>> 1.Rebuild the packages that was modified (ulogd and initrd in our case) to
>> check that all is correct.
>> 2. do a: git diff origin/master and check the diff
>
> I've been too impatient and tried myself, sorry. You see in the commit
> that something went wrong :(
>
> I consider it as the expectable end of a day that started bad as well...
>
> I hope you can help fixing it
Yes you have commit some garbages :D like:
<<<<<<< HEAD
Version = 5.0-prealpha
Revision = 4
=======
Version = 4.3.1-rc1
Revision = 1
>>>>>>> maint
I have rewind the branch master. So do a:
git fetch
git checkout master
git reset --hard origin/master
I will merge maint into master tomorrow
Yves
------------------------------------------------------------------------------
Got visibility?
Most devs has no idea what their production app looks like.
Find out how fast your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219671;13503038;y?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel
