Hey guys,
I was working on updating a differential when some other code was pushed. I git-merged in the changes and had some conflicts, resolving them pretty easily. The differential confusion occured when I finished the git-merge and immediately submitted the update to the differential. The code displayed seemed to have been ignoring my manual merge resolution and wasn't reflecting the current state of code, instead showing the change as backwards from what was on the common branch and my local copy of the branch.
my `.arcconfig` looks like this with some names redacted
```
{
"project.name" : "MY-PROJECT",
"phabricator.uri" : "MY-URI",
"arc.land.onto.default" : "COMMON-BRANCH",
"base": "git:merge-base(origin/COMMON-BRANCH), arc:upstream, git:HEAD^"
}
```
I was wondering if I did something incorrectly, or if this is a bug. Thanks for any explanations you might offer!