I had been working in Git online and in R, but not Desktop. I had made some commits in R and hadn't pushed them online, and I also uploaded a new figure to Git online. Then when I tried pushing or pulling in R, it wouldn't let me because I had divergent branches. (I had been working only in my Brower branch.) It told me I needed to run R commands, either to merge, rebase, or fast-forward only (no clue what those last 2 mean). I deleted the figure from Git online and tried again and received the same error messages. Then I remembered I had dealt with divergent branches before - in Desktop. I opened Desktop and was able to both push and pull, which reconciled the divergence and am able to push/pull from R again.
I had been working in Git online and in R, but not Desktop. I had made some commits in R and hadn't pushed them online, and I also uploaded a new figure to Git online. Then when I tried pushing or pulling in R, it wouldn't let me because I had divergent branches. (I had been working only in my Brower branch.) It told me I needed to run R commands, either to merge, rebase, or fast-forward only (no clue what those last 2 mean). I deleted the figure from Git online and tried again and received the same error messages. Then I remembered I had dealt with divergent branches before - in Desktop. I opened Desktop and was able to both push and pull, which reconciled the divergence and am able to push/pull from R again.