On Tue, Mar 27, 2018 at 12:53:52PM +0300, Orgad Shaneh wrote:
> If I cherry-pick a commit that added a line, then merge another commit
> which removes this line, the line remains in the file instead of being
> removed.
>
> The following script demonstrates the bug.
>
> file should be equivalent
Hi,
If I cherry-pick a commit that added a line, then merge another commit
which removes this line, the line remains in the file instead of being
removed.
The following script demonstrates the bug.
file should be equivalent on both branches
git init
seq 1 20 > file
git add file
git commit -m 'I
2 matches
Mail list logo
