|
From: | Ramesh Nedunchezian |
Subject: | Does wip-cite work with master or 9.4.5 release? |
Date: | Thu, 8 Apr 2021 19:20:22 +0530 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
I tried checking out wip-cite like so. git reset --hard release_9.4.5 git merge wip-cite git diff > conflict.diff I am seeing merge conflicts. See attached diff. Does wip-cite doesn't work with master or 9.4.5? Am I doing something wrong?
conflict.diff
Description: Text Data
[Prev in Thread] | Current Thread | [Next in Thread] |