Details
Details
Things I've tried: Deleted the folder, pulled everything, ran arc patch D354, fixed merge conflicts, and now arc land gives me a merge conflict, but git merge doesn't.
When I run git merge, it says that the branch is already up to date, but when I checked on diffusion the changes aren't there and the differential hasn't landed yet. What to do?
When I run git merge, it says that the branch is already up to date, but when I checked on diffusion the changes aren't there and the differential hasn't landed yet. What to do?
Asked by memateo on Feb 28 2021, 10:42 AM.