Working on the ”same” branch with others. #7388
-
|
Maybe this question has already been answered, and if so I would appreciate a link there very much! Twice a week I and a few of my colleagues sit and mob-program together, and while doing so we push up our changes and pull them down again. (Due to some of working remote) How can I with gitbutler take their changes on that branch and update my virtual branch, do some work and then push the changes back up again? Maybe updates happens automatically? And I cannot see where I can base my virtual branch. Just want to say that I have done a search on the issue, and could only find info about stacked-branches, which does not really solve my issue. Thanks in advance! |
Beta Was this translation helpful? Give feedback.
Replies: 1 comment
-
|
Thanks for asking! First off, let me CC @krlvi to chime in as well as I am likely to miss something. When working with colleagues on the same branch, that branch would have to be in your workspace. GitButler will detect the remote tracking branch and show which commits the local branch doesn't have. There it would allow you to update the local branch to catch up with the remote. Commits on top of that can be pushed to the remote as well. In theory, this workflow is fully supported, please feel free to ask more specific questions as they arise. |
Beta Was this translation helpful? Give feedback.
Thanks for asking! First off, let me CC @krlvi to chime in as well as I am likely to miss something.
When working with colleagues on the same branch, that branch would have to be in your workspace. GitButler will detect the remote tracking branch and show which commits the local branch doesn't have. There it would allow you to update the local branch to catch up with the remote. Commits on top of that can be pushed to the remote as well.
In theory, this workflow is fully supported, please feel free to ask more specific questions as they arise.