-
Not really sure how this came about. See https://github.com/keybounce/Finite-Fluids/network
On july 18th, I started using gitflow. You'll see "hotfix/Refactor_water_flow". This was a "simple" edit (N…
-
Once the pull request is reviewed and approved, our workflow is that the author should merge it. This can be done easily through GitHub UI (there is a "Squash and merge" button).
There are a couple…
-
Is it possible for you to change from `git log` to `git diff-tree`? Due to some merge back, git log show files that hasn't really changed (possible due to squash merges), and then creating false posit…
-
I would merge #196 but I do not know whether merge commit, squash and merge, or rebase and merge are preferred. Please specify in `CONTRIBUTING.md`.
-
Basically, a command line tool that will automatically pick up commits from the branch add metadata to them and merge into the specified branch.
- [ ] cherry-pick commits from `source` branch
- [ …
-
### The feature request
In the Branch Menu there's "Rebase current branch" entry that rebases the current branch onto the selected one in the dialog.
If I want to merge a feature branch and I want a…
-
I've found PRs are far more helpful in understanding changes when looking back than commit messages. Looking for any other feedback before updating our PR template to be more useful:
---
1- I thin…
-
Proposal to automate these commands:
- git checkout develop
- git checkout -b feature-*
- git push -u ajsb85 feature-*
- git checkout develop
- git merge --squash feature-*
- git commit -m "fe…
-
I suggested that all branches could deploy to QA and we just get the most recently updated one, so that you can easily squash-merge changes when finished.
Show the commit ID on the website so we ca…
-
## Story
We actually have 3 verification levels possible which each have different use cases and tradeoffs. I have taken to calling this the "anchor" status. The signature will be valid, but the an…