search

feenkcom / gtoolkit

Glamorous Toolkit is the Moldable Development environment. It empowers you to make systems explainable through experiences tailored for each problem.
https://gtoolkit.com
MIT License
1.12k stars 49 forks source link

[Git Tool]: Better Branch Support (for e.g. Pull Requests and Feature Branchs) #3592

Open seandenigris opened 10 months ago

seandenigris commented 10 months ago

Motivation: Many projects use feature branches and pull requests. This is currently so awkward in GT's git tool that in practice users must retreat either to the command line or Morphic Iceberg.

Pharo handles this use case well. The difference is:

  1. When creating a new branch, only do so in git and the filesystem. Do not affect the Smalltalk code that is currently loaded from the repo
  2. After a commit is made to a new branch, activate the push button

Here is a relevant excerpt from my original feedback on Discord:

Creating a feature branch: It seems that changing the branch in the git tool wipes out the changes in the image. This is not what happens in Pharo. I commonly want to change the branch so that I can do a PR on GH. With the current behavior, it seems I have to either realize that before I start to make any changes, which is impractical, or replay all the changes after switching branches, which is a pain

Pushing changes - after I commit on the feature branch, the git tool does not show a push button. Not knowing how to overcome that, I did the push on the command line

svenvc commented 5 months ago

Today more is possible.

https://github.com/feenkcom/gtoolkit/issues/3079

https://github.com/feenkcom/gtoolkit/issues/3819

seandenigris commented 2 months ago

I commented in #3962. While the instructions in the book seem to work (at the cost of having one's GH token floating around the image), the issue I described with the git tool GUI, and some others, still exist, but are probably easily fixable.