[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

how to cherry-pick cleanly (Re: Bug#833421: jessie-pu: debian-edu-config/1.818+deb8u2])

On Tue, Aug 09, 2016 at 01:29:38PM +0000, Holger Levsen wrote:
> those I all picked (in reverse order) and made apply cleanly, the result
> is in the branch h01ger/jessie-proposed.

the way I do this:

git cherry-pick -x $commit
-> boom conflicts
git status	# learn about the conflicts
vi $file
git diff	# shows the conflicting files and their current diff 
		# previous commit
git show $commit	# compare with what I want to cherry-pick
vi $file	# optionally, if I wasn't happy…
git add $file
git cherry-pick --continue
git show $commit	# again, compare what I wanted to pick…
git log -p -1		# with what I have picked…

if I'm unhappy with the cherry-picked result I have created I juse "git
rebase -i HEAD~2" and then just I just remove the last commit manually
and restart the cherry-picking from the beginning.


Attachment: signature.asc
Description: Digital signature

Reply to: