Setting Origin and Upstream in Gitkraken
I don't know how recently it is possible, but in version 6.0.0 of GitKraken, you can right-click on an origin and change push and pull paths independently.
My question is, is there any way to set a different remote repository in Gitkraken for pushes and pulls?
There is no such feature AFAIK. When right-clicking a branch, you can select to Set Upstream
. This results in the message What remote/branch should "<branch>" push to an pull from?
, which implies that a branch can only be set to push and pull from the same upstream via GitKraken.
[...] is there a way to track a different remote branch from the one you are pushing/pulling from?
I do not understand what you mean by "track" here, since a branch tracking an upstream means it is using it to pull from and/or push to. As per definition here in section Tracking Branches
, upstream and tracking branch are used synonymous, so I guess the answer is no:
[...]what is called a “tracking branch” (or sometimes an “upstream branch”).
Concerning your last question, you can calm down:
[...]if I right click upstream/develop there is an option to
merge upstream/develop into develop
that should take the most recent changes in upstream/develop and merge it into my local copy right?
That's exactly what it does, just like a git merge upstream/develop
when you have checked out your local develop
.